Fixes for context problem in OmniORB

Bill Janssen janssen@parc.xerox.com
Mon, 6 Oct 1997 20:15:00 PDT


Here's a patch that fixes the service context problem (sheesh, now I'm
bugfixing other ORBs! :-):

*** 1.1	1997/10/07 03:09:12
--- src/lib/omniORB2/giopClient.cc	1997/10/07 03:09:28
***************
*** 216,224 ****
  
    // XXX Do not support any service context yet, 
    // XXX For the moment, skips the service context
    CORBA::ULong svcctxtsize;
!   svcctxtsize <<= *this;
!   skip(svcctxtsize);
  
    CORBA::ULong req_id;
    req_id <<= *this;
--- 216,230 ----
  
    // XXX Do not support any service context yet, 
    // XXX For the moment, skips the service context
+   CORBA::ULong svcccount;
+   CORBA::ULong svcctag;
    CORBA::ULong svcctxtsize;
!   svcccount <<= *this;
!   while (svcccount-- > 0) {
!     svcctag <<= *this;
!     svcctxtsize <<= *this;
!     skip(svcctxtsize);
!   };
  
    CORBA::ULong req_id;
    req_id <<= *this;
*** 1.1	1997/10/07 03:07:21
--- src/lib/omniORB2/giopServer.cc	1997/10/07 03:08:55
***************
*** 384,392 ****
    
      // XXX Do not support any service context yet, 
      // XXX For the moment, skips the service context
      CORBA::ULong svcctxtsize;
!     svcctxtsize <<= *this;
!     skip(svcctxtsize);
  
      pd_request_id <<= *this;
  
--- 384,398 ----
    
      // XXX Do not support any service context yet, 
      // XXX For the moment, skips the service context
+     CORBA::ULong svcccount;
+     CORBA::ULong svcctag;
      CORBA::ULong svcctxtsize;
!     svcccount <<= *this;
!     while (svcccount-- > 0) {
!       svcctag <<= *this;
!       svcctxtsize <<= *this;
!       skip(svcctxtsize);
!     };
  
      pd_request_id <<= *this;