Thu May 3 11:55:42 2001 Pradeep Gore <pradeep@cs.wustl.edu>

author: pradeep <pradeep@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> 2001-05-03 17:13:21 +0000
committer: pradeep <pradeep@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> 2001-05-03 17:13:21 +0000
commit: 4617dba8623e30d0bde198fa6243f995adc948a6 (patch)
tree: c117412f26e505aa03681175feabead8308132a7
parent: cd6754040daa726a31ee13423e60aaaf14d35294 (diff)
download: ATCD-4617dba8623e30d0bde198fa6243f995adc948a6.tar.gz
10 files changed, 1184 insertions, 877 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 10847452b8c..d13ff491f98 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,11 +1,34 @@
+Thu May  3 11:55:42 2001  Pradeep Gore  <pradeep@cs.wustl.edu>
+
+	These are a set of changes for enabling lock free CDR input
+	stream allocators in TAO as default. (see my previous changes on
+	Tue Apr 10 17:25:18 2001)
+
+	* TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp:
+	   Modified the TAO_CodeGen::TAO_CDR_INPUT case to perform octet
+	   sequence optimization only if its safe. This check was absent
+	   previously, forcing us to always use locked input cdr allocators.
+	* tao/IOPC.cpp:
+	* tao/MessagingC.cpp:
+	* tao/Services.cpp:
+	* tao/PortableServer/PortableServerC.cpp:
+	  Files affected by the IDL compiler changes had to be redone.
+	* tao/diffs/IOPC.cpp.diff:
+	* tao/diffs/MessagingC.cpp.diff:
+	* tao/diffs/PortableServerC.cpp.diff:
+	* tao/diffs/OctetSeqC.cpp.diff:
+	  Regenerated the diff files. Note that i have added
+	OctetSeqC.cpp.diff. This should be used to patch the IDL generated
+	stub file instead of OctetSeq.diff.
+
 Thu May  3 10:11:08 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
 
 	* tao/Wait_Strategy.h: Removed some comments that were not
-	  applicable anymore.  
+	  applicable anymore.
 
 Wed May  2 22:39:06 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
 
-	* tao/ORB_Core.cpp: Fixed a couple of unused variable warnings.  
+	* tao/ORB_Core.cpp: Fixed a couple of unused variable warnings.
 
 Wed May  2 20:26:56 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
 
@@ -31,11 +54,11 @@ Wed May  2 16:52:09 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
 	      the thread may very well create the connections). We want
 	      the connections to be reused by other threads and so we
 	      cannot destroy the connections when the threads go
-	      away. 
+	      away.
 
 	  The above two reasons motivated adding new methods that dish out
-	  memory from the global pool alone,  even if the ORB has been 
-	  configured to use TSS. 
+	  memory from the global pool alone,  even if the ORB has been
+	  configured to use TSS.
 
 	* tao/GIOP_Message_Base.cpp: Changes for bug id 871. We were
 	  trying to use a constructor for an InputCDR stream that made a
@@ -48,8 +71,8 @@ Wed May  2 16:52:09 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
 	  by the Reply_Dispatcher only uses this very same  data block to
 	  pass it onto the stubs. So this should give us a neat path with
 	  no-copies to the stubs. But there is one release that can be
-	  removed which will be done in the next cycle. 
-	  
+	  removed which will be done in the next cycle.
+
 	* tao/GIOP_Message_Handler.cpp:
 	* tao/GIOP_Message_Handler.h:
 	* tao/GIOP_Message_Handler.inl: Added a new method
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp
index 0b9f85f7f49..399992eadfb 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp
@@ -316,9 +316,14 @@ be_visitor_sequence_cdr_op_cs::visit_predefined_type (be_predefined_type *node)
         {
         case TAO_CodeGen::TAO_CDR_INPUT:
           {
-            *os << "if (ACE_BIT_DISABLED (strm.start ()->flags (),"
+            *os << "if (ACE_BIT_DISABLED (strm.start ()->flags ()," << be_nl
                 << "ACE_Message_Block::DONT_DELETE))" << be_nl
                 << "{" << be_idt_nl
+                <<  "TAO_ORB_Core* orb_core = strm.orb_core ();" << be_nl
+                << "if (orb_core != 0 &&" << be_nl
+                << "strm.orb_core ()->resource_factory ()->" << be_nl
+                << "input_cdr_allocator_type_locked () == 1)" << be_nl
+                << "{" << be_idt_nl
                 << "TAO_Unbounded_Sequence<CORBA::Octet> *oseq = " << be_nl
                 << "  ACE_static_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, "
                 << "&_tao_sequence);" << be_nl
@@ -328,11 +333,10 @@ be_visitor_sequence_cdr_op_cs::visit_predefined_type (be_predefined_type *node)
                 << "_tao_seq_len);" << be_nl
                 << "strm.skip_bytes (_tao_seq_len);" << be_nl
                 << "return 1;" << be_uidt_nl
+                << "}" << be_uidt_nl
                 << "}" << be_nl
-                << "else" << be_idt_nl
                 << "return strm.read_octet_array ("
-                << "_tao_sequence.get_buffer (), _tao_seq_len);"
-                << be_uidt_nl;
+                << "_tao_sequence.get_buffer (), _tao_seq_len);";
           }
           break;
         case TAO_CodeGen::TAO_CDR_OUTPUT:
diff --git a/TAO/tao/IOPC.cpp b/TAO/tao/IOPC.cpp
index 7229806c7ee..8c472ca1e2b 100644
--- a/TAO/tao/IOPC.cpp
+++ b/TAO/tao/IOPC.cpp
@@ -30,22 +30,23 @@
 #endif /* !defined INLINE */
 
 #include "Typecode.h"
+#include "ORB_Core.h"
 
 static const CORBA::Long _oc_IOP_ProfileId[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   30,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x494f502f), 
-  ACE_NTOHL (0x50726f66), 
-  ACE_NTOHL (0x696c6549), 
-  ACE_NTOHL (0x643a312e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x494f502f),
+  ACE_NTOHL (0x50726f66),
+  ACE_NTOHL (0x696c6549),
+  ACE_NTOHL (0x643a312e),
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ProfileId:1.0
   10,
-  ACE_NTOHL (0x50726f66), 
-  ACE_NTOHL (0x696c6549), 
+  ACE_NTOHL (0x50726f66),
+  ACE_NTOHL (0x696c6549),
   ACE_NTOHL (0x64000000),  // name = ProfileId
   CORBA::tk_ulong,
 
@@ -76,19 +77,19 @@ static const CORBA::Long _oc_IOP_TaggedProfile[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   34,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x494f502f), 
-  ACE_NTOHL (0x54616767), 
-  ACE_NTOHL (0x65645072), 
-  ACE_NTOHL (0x6f66696c), 
-  ACE_NTOHL (0x653a312e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x494f502f),
+  ACE_NTOHL (0x54616767),
+  ACE_NTOHL (0x65645072),
+  ACE_NTOHL (0x6f66696c),
+  ACE_NTOHL (0x653a312e),
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/TaggedProfile:1.0
   14,
-  ACE_NTOHL (0x54616767), 
-  ACE_NTOHL (0x65645072), 
-  ACE_NTOHL (0x6f66696c), 
+  ACE_NTOHL (0x54616767),
+  ACE_NTOHL (0x65645072),
+  ACE_NTOHL (0x6f66696c),
   ACE_NTOHL (0x65000000),  // name = TaggedProfile
   2, // member count
   4,
@@ -97,25 +98,25 @@ static const CORBA::Long _oc_IOP_TaggedProfile[] =
   60, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     30,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x494f502f), 
-    ACE_NTOHL (0x50726f66), 
-    ACE_NTOHL (0x696c6549), 
-    ACE_NTOHL (0x643a312e), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x494f502f),
+    ACE_NTOHL (0x50726f66),
+    ACE_NTOHL (0x696c6549),
+    ACE_NTOHL (0x643a312e),
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ProfileId:1.0
     10,
-    ACE_NTOHL (0x50726f66), 
-    ACE_NTOHL (0x696c6549), 
+    ACE_NTOHL (0x50726f66),
+    ACE_NTOHL (0x696c6549),
     ACE_NTOHL (0x64000000),  // name = ProfileId
     CORBA::tk_ulong,
 
 
   13,
-  ACE_NTOHL (0x70726f66), 
-  ACE_NTOHL (0x696c655f), 
-  ACE_NTOHL (0x64617461), 
+  ACE_NTOHL (0x70726f66),
+  ACE_NTOHL (0x696c655f),
+  ACE_NTOHL (0x64617461),
   ACE_NTOHL (0x0),  // name = profile_data
   CORBA::tk_sequence, // typecode kind
   12, // encapsulation length
@@ -156,30 +157,30 @@ void IOP::TaggedProfile::_tao_any_destructor (void *x)
 IOP::TaggedProfile::_tao_seq_Octet::_tao_seq_Octet (void)
 {}
 IOP::TaggedProfile::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max) // uses max size
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   TAO_Unbounded_Sequence<CORBA::Octet>
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<CORBA::Octet>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max)
 {}
 IOP::TaggedProfile::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max, CORBA::ULong length, CORBA::Octet *buffer, CORBA::Boolean release)
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   TAO_Unbounded_Sequence<CORBA::Octet>
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<CORBA::Octet>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max, length, buffer, release)
 {}
 IOP::TaggedProfile::_tao_seq_Octet::_tao_seq_Octet (const _tao_seq_Octet &seq) // copy ctor
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   TAO_Unbounded_Sequence<CORBA::Octet>
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<CORBA::Octet>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (seq)
 {}
 IOP::TaggedProfile::_tao_seq_Octet::~_tao_seq_Octet (void) // dtor
@@ -197,23 +198,23 @@ static const CORBA::Long _oc_IOP_IOR[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   24,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x494f502f), 
-  ACE_NTOHL (0x494f523a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x494f502f),
+  ACE_NTOHL (0x494f523a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/IOR:1.0
   4,
   ACE_NTOHL (0x494f5200),  // name = IOR
   2, // member count
   8,
-  ACE_NTOHL (0x74797065), 
+  ACE_NTOHL (0x74797065),
   ACE_NTOHL (0x5f696400),  // name = type_id
-  CORBA::tk_string, 
+  CORBA::tk_string,
   0U, // string length
   9,
-  ACE_NTOHL (0x70726f66), 
-  ACE_NTOHL (0x696c6573), 
+  ACE_NTOHL (0x70726f66),
+  ACE_NTOHL (0x696c6573),
   ACE_NTOHL (0x0),  // name = profiles
   CORBA::tk_sequence, // typecode kind
   200, // encapsulation length
@@ -222,19 +223,19 @@ static const CORBA::Long _oc_IOP_IOR[] =
     184, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       34,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x494f502f), 
-      ACE_NTOHL (0x54616767), 
-      ACE_NTOHL (0x65645072), 
-      ACE_NTOHL (0x6f66696c), 
-      ACE_NTOHL (0x653a312e), 
+      ACE_NTOHL (0x49444c3a),
+      ACE_NTOHL (0x6f6d672e),
+      ACE_NTOHL (0x6f72672f),
+      ACE_NTOHL (0x494f502f),
+      ACE_NTOHL (0x54616767),
+      ACE_NTOHL (0x65645072),
+      ACE_NTOHL (0x6f66696c),
+      ACE_NTOHL (0x653a312e),
       ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/TaggedProfile:1.0
       14,
-      ACE_NTOHL (0x54616767), 
-      ACE_NTOHL (0x65645072), 
-      ACE_NTOHL (0x6f66696c), 
+      ACE_NTOHL (0x54616767),
+      ACE_NTOHL (0x65645072),
+      ACE_NTOHL (0x6f66696c),
       ACE_NTOHL (0x65000000),  // name = TaggedProfile
       2, // member count
       4,
@@ -243,25 +244,25 @@ static const CORBA::Long _oc_IOP_IOR[] =
       60, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         30,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x494f502f), 
-        ACE_NTOHL (0x50726f66), 
-        ACE_NTOHL (0x696c6549), 
-        ACE_NTOHL (0x643a312e), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x494f502f),
+        ACE_NTOHL (0x50726f66),
+        ACE_NTOHL (0x696c6549),
+        ACE_NTOHL (0x643a312e),
         ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ProfileId:1.0
         10,
-        ACE_NTOHL (0x50726f66), 
-        ACE_NTOHL (0x696c6549), 
+        ACE_NTOHL (0x50726f66),
+        ACE_NTOHL (0x696c6549),
         ACE_NTOHL (0x64000000),  // name = ProfileId
         CORBA::tk_ulong,
 
 
       13,
-      ACE_NTOHL (0x70726f66), 
-      ACE_NTOHL (0x696c655f), 
-      ACE_NTOHL (0x64617461), 
+      ACE_NTOHL (0x70726f66),
+      ACE_NTOHL (0x696c655f),
+      ACE_NTOHL (0x64617461),
       ACE_NTOHL (0x0),  // name = profile_data
       CORBA::tk_sequence, // typecode kind
       12, // encapsulation length
@@ -296,7 +297,7 @@ void IOP::IOR::_tao_any_destructor (void *x)
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_IOP_IOR__TAO_SEQ_TAGGEDPROFILE_CS_)
 #define __TAO_UNBOUNDED_SEQUENCE_IOP_IOR__TAO_SEQ_TAGGEDPROFILE_CS_
 
@@ -305,43 +306,43 @@ void IOP::IOR::_tao_any_destructor (void *x)
   {
     IOP::TaggedProfile* tmp = 0;
     tmp = _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::allocbuf (length);
-    
+
     if (this->buffer_ != 0)
     {
       IOP::TaggedProfile *old = ACE_reinterpret_cast (IOP::TaggedProfile *,this->buffer_);
-      
+
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         tmp[i] = old[i];
-      
+
       if (this->release_)
         _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::freebuf (old);
-      
+
     }
     this->buffer_ = tmp;
   }
-  
+
   void
   IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::_deallocate_buffer (void)
   {
     if (this->buffer_ == 0 || this->release_ == 0)
       return;
-    
+
     IOP::TaggedProfile *tmp = ACE_reinterpret_cast (IOP::TaggedProfile *,this->buffer_);
-    
+
     _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::freebuf (tmp);
     this->buffer_ = 0;
-  } 
-  
+  }
+
   IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::~_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile (void) // Dtor.
   {
     this->_deallocate_buffer ();
   }
-  
-  
+
+
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_IOP_IOR__TAO_SEQ_TAGGEDPROFILE_CS_)
 #define _IOP_IOR__TAO_SEQ_TAGGEDPROFILE_CS_
@@ -353,30 +354,30 @@ void IOP::IOR::_tao_any_destructor (void *x)
 IOP::IOR::_tao_seq_TaggedProfile::_tao_seq_TaggedProfile (void)
 {}
 IOP::IOR::_tao_seq_TaggedProfile::_tao_seq_TaggedProfile (CORBA::ULong max) // uses max size
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<IOP::TaggedProfile>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max)
 {}
 IOP::IOR::_tao_seq_TaggedProfile::_tao_seq_TaggedProfile (CORBA::ULong max, CORBA::ULong length, IOP::TaggedProfile *buffer, CORBA::Boolean release)
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<IOP::TaggedProfile>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max, length, buffer, release)
 {}
 IOP::IOR::_tao_seq_TaggedProfile::_tao_seq_TaggedProfile (const _tao_seq_TaggedProfile &seq) // copy ctor
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<IOP::TaggedProfile>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (seq)
 {}
 IOP::IOR::_tao_seq_TaggedProfile::~_tao_seq_TaggedProfile (void) // dtor
@@ -394,17 +395,17 @@ static const CORBA::Long _oc_IOP_ComponentId[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   32,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x494f502f), 
-  ACE_NTOHL (0x436f6d70), 
-  ACE_NTOHL (0x6f6e656e), 
-  ACE_NTOHL (0x7449643a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x494f502f),
+  ACE_NTOHL (0x436f6d70),
+  ACE_NTOHL (0x6f6e656e),
+  ACE_NTOHL (0x7449643a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/ComponentId:1.0
   12,
-  ACE_NTOHL (0x436f6d70), 
-  ACE_NTOHL (0x6f6e656e), 
+  ACE_NTOHL (0x436f6d70),
+  ACE_NTOHL (0x6f6e656e),
   ACE_NTOHL (0x74496400),  // name = ComponentId
   CORBA::tk_ulong,
 
@@ -427,19 +428,19 @@ static const CORBA::Long _oc_IOP_TaggedComponent[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   36,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x494f502f), 
-  ACE_NTOHL (0x54616767), 
-  ACE_NTOHL (0x6564436f), 
-  ACE_NTOHL (0x6d706f6e), 
-  ACE_NTOHL (0x656e743a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x494f502f),
+  ACE_NTOHL (0x54616767),
+  ACE_NTOHL (0x6564436f),
+  ACE_NTOHL (0x6d706f6e),
+  ACE_NTOHL (0x656e743a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/TaggedComponent:1.0
   16,
-  ACE_NTOHL (0x54616767), 
-  ACE_NTOHL (0x6564436f), 
-  ACE_NTOHL (0x6d706f6e), 
+  ACE_NTOHL (0x54616767),
+  ACE_NTOHL (0x6564436f),
+  ACE_NTOHL (0x6d706f6e),
   ACE_NTOHL (0x656e7400),  // name = TaggedComponent
   2, // member count
   4,
@@ -448,25 +449,25 @@ static const CORBA::Long _oc_IOP_TaggedComponent[] =
   60, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     32,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x494f502f), 
-    ACE_NTOHL (0x436f6d70), 
-    ACE_NTOHL (0x6f6e656e), 
-    ACE_NTOHL (0x7449643a), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x494f502f),
+    ACE_NTOHL (0x436f6d70),
+    ACE_NTOHL (0x6f6e656e),
+    ACE_NTOHL (0x7449643a),
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/ComponentId:1.0
     12,
-    ACE_NTOHL (0x436f6d70), 
-    ACE_NTOHL (0x6f6e656e), 
+    ACE_NTOHL (0x436f6d70),
+    ACE_NTOHL (0x6f6e656e),
     ACE_NTOHL (0x74496400),  // name = ComponentId
     CORBA::tk_ulong,
 
 
   15,
-  ACE_NTOHL (0x636f6d70), 
-  ACE_NTOHL (0x6f6e656e), 
-  ACE_NTOHL (0x745f6461), 
+  ACE_NTOHL (0x636f6d70),
+  ACE_NTOHL (0x6f6e656e),
+  ACE_NTOHL (0x745f6461),
   ACE_NTOHL (0x74610000),  // name = component_data
   CORBA::tk_sequence, // typecode kind
   12, // encapsulation length
@@ -507,30 +508,30 @@ void IOP::TaggedComponent::_tao_any_destructor (void *x)
 IOP::TaggedComponent::_tao_seq_Octet::_tao_seq_Octet (void)
 {}
 IOP::TaggedComponent::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max) // uses max size
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   TAO_Unbounded_Sequence<CORBA::Octet>
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<CORBA::Octet>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max)
 {}
 IOP::TaggedComponent::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max, CORBA::ULong length, CORBA::Octet *buffer, CORBA::Boolean release)
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   TAO_Unbounded_Sequence<CORBA::Octet>
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<CORBA::Octet>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max, length, buffer, release)
 {}
 IOP::TaggedComponent::_tao_seq_Octet::_tao_seq_Octet (const _tao_seq_Octet &seq) // copy ctor
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   TAO_Unbounded_Sequence<CORBA::Octet>
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<CORBA::Octet>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (seq)
 {}
 IOP::TaggedComponent::_tao_seq_Octet::~_tao_seq_Octet (void) // dtor
@@ -546,7 +547,7 @@ void IOP::TaggedComponent::_tao_seq_Octet::_tao_any_destructor (void *x)
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_IOP_MULTIPLECOMPONENTPROFILE_CS_)
 #define __TAO_UNBOUNDED_SEQUENCE_IOP_MULTIPLECOMPONENTPROFILE_CS_
 
@@ -555,43 +556,43 @@ void IOP::TaggedComponent::_tao_seq_Octet::_tao_any_destructor (void *x)
   {
     IOP::TaggedComponent* tmp = 0;
     tmp = _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::allocbuf (length);
-    
+
     if (this->buffer_ != 0)
     {
       IOP::TaggedComponent *old = ACE_reinterpret_cast (IOP::TaggedComponent *,this->buffer_);
-      
+
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         tmp[i] = old[i];
-      
+
       if (this->release_)
         _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::freebuf (old);
-      
+
     }
     this->buffer_ = tmp;
   }
-  
+
   void
   IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::_deallocate_buffer (void)
   {
     if (this->buffer_ == 0 || this->release_ == 0)
       return;
-    
+
     IOP::TaggedComponent *tmp = ACE_reinterpret_cast (IOP::TaggedComponent *,this->buffer_);
-    
+
     _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::freebuf (tmp);
     this->buffer_ = 0;
-  } 
-  
+  }
+
   IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::~_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile (void) // Dtor.
   {
     this->_deallocate_buffer ();
   }
-  
-  
+
+
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_IOP_MULTIPLECOMPONENTPROFILE_CS_)
 #define _IOP_MULTIPLECOMPONENTPROFILE_CS_
@@ -603,30 +604,30 @@ void IOP::TaggedComponent::_tao_seq_Octet::_tao_any_destructor (void *x)
 IOP::MultipleComponentProfile::MultipleComponentProfile (void)
 {}
 IOP::MultipleComponentProfile::MultipleComponentProfile (CORBA::ULong max) // uses max size
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<IOP::TaggedComponent>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max)
 {}
 IOP::MultipleComponentProfile::MultipleComponentProfile (CORBA::ULong max, CORBA::ULong length, IOP::TaggedComponent *buffer, CORBA::Boolean release)
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<IOP::TaggedComponent>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max, length, buffer, release)
 {}
 IOP::MultipleComponentProfile::MultipleComponentProfile (const MultipleComponentProfile &seq) // copy ctor
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<IOP::TaggedComponent>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (seq)
 {}
 IOP::MultipleComponentProfile::~MultipleComponentProfile (void) // dtor
@@ -644,25 +645,25 @@ static const CORBA::Long _oc_IOP_MultipleComponentProfile[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   45,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x494f502f), 
-  ACE_NTOHL (0x4d756c74), 
-  ACE_NTOHL (0x69706c65), 
-  ACE_NTOHL (0x436f6d70), 
-  ACE_NTOHL (0x6f6e656e), 
-  ACE_NTOHL (0x7450726f), 
-  ACE_NTOHL (0x66696c65), 
-  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x494f502f),
+  ACE_NTOHL (0x4d756c74),
+  ACE_NTOHL (0x69706c65),
+  ACE_NTOHL (0x436f6d70),
+  ACE_NTOHL (0x6f6e656e),
+  ACE_NTOHL (0x7450726f),
+  ACE_NTOHL (0x66696c65),
+  ACE_NTOHL (0x3a312e30),
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IOP/MultipleComponentProfile:1.0
   25,
-  ACE_NTOHL (0x4d756c74), 
-  ACE_NTOHL (0x69706c65), 
-  ACE_NTOHL (0x436f6d70), 
-  ACE_NTOHL (0x6f6e656e), 
-  ACE_NTOHL (0x7450726f), 
-  ACE_NTOHL (0x66696c65), 
+  ACE_NTOHL (0x4d756c74),
+  ACE_NTOHL (0x69706c65),
+  ACE_NTOHL (0x436f6d70),
+  ACE_NTOHL (0x6f6e656e),
+  ACE_NTOHL (0x7450726f),
+  ACE_NTOHL (0x66696c65),
   ACE_NTOHL (0x0),  // name = MultipleComponentProfile
   CORBA::tk_sequence, // typecode kind
   200, // encapsulation length
@@ -671,19 +672,19 @@ static const CORBA::Long _oc_IOP_MultipleComponentProfile[] =
     184, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       36,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x494f502f), 
-      ACE_NTOHL (0x54616767), 
-      ACE_NTOHL (0x6564436f), 
-      ACE_NTOHL (0x6d706f6e), 
-      ACE_NTOHL (0x656e743a), 
+      ACE_NTOHL (0x49444c3a),
+      ACE_NTOHL (0x6f6d672e),
+      ACE_NTOHL (0x6f72672f),
+      ACE_NTOHL (0x494f502f),
+      ACE_NTOHL (0x54616767),
+      ACE_NTOHL (0x6564436f),
+      ACE_NTOHL (0x6d706f6e),
+      ACE_NTOHL (0x656e743a),
       ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/TaggedComponent:1.0
       16,
-      ACE_NTOHL (0x54616767), 
-      ACE_NTOHL (0x6564436f), 
-      ACE_NTOHL (0x6d706f6e), 
+      ACE_NTOHL (0x54616767),
+      ACE_NTOHL (0x6564436f),
+      ACE_NTOHL (0x6d706f6e),
       ACE_NTOHL (0x656e7400),  // name = TaggedComponent
       2, // member count
       4,
@@ -692,25 +693,25 @@ static const CORBA::Long _oc_IOP_MultipleComponentProfile[] =
       60, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         32,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x494f502f), 
-        ACE_NTOHL (0x436f6d70), 
-        ACE_NTOHL (0x6f6e656e), 
-        ACE_NTOHL (0x7449643a), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x494f502f),
+        ACE_NTOHL (0x436f6d70),
+        ACE_NTOHL (0x6f6e656e),
+        ACE_NTOHL (0x7449643a),
         ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/ComponentId:1.0
         12,
-        ACE_NTOHL (0x436f6d70), 
-        ACE_NTOHL (0x6f6e656e), 
+        ACE_NTOHL (0x436f6d70),
+        ACE_NTOHL (0x6f6e656e),
         ACE_NTOHL (0x74496400),  // name = ComponentId
         CORBA::tk_ulong,
 
 
       15,
-      ACE_NTOHL (0x636f6d70), 
-      ACE_NTOHL (0x6f6e656e), 
-      ACE_NTOHL (0x745f6461), 
+      ACE_NTOHL (0x636f6d70),
+      ACE_NTOHL (0x6f6e656e),
+      ACE_NTOHL (0x745f6461),
       ACE_NTOHL (0x74610000),  // name = component_data
       CORBA::tk_sequence, // typecode kind
       12, // encapsulation length
@@ -739,7 +740,7 @@ TAO_NAMESPACE_END
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_IOP_TAGGEDCOMPONENTLIST_CS_)
 #define __TAO_UNBOUNDED_SEQUENCE_IOP_TAGGEDCOMPONENTLIST_CS_
 
@@ -748,43 +749,43 @@ TAO_NAMESPACE_END
   {
     IOP::TaggedComponent* tmp = 0;
     tmp = _TAO_Unbounded_Sequence_IOP_TaggedComponentList::allocbuf (length);
-    
+
     if (this->buffer_ != 0)
     {
       IOP::TaggedComponent *old = ACE_reinterpret_cast (IOP::TaggedComponent *,this->buffer_);
-      
+
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         tmp[i] = old[i];
-      
+
       if (this->release_)
         _TAO_Unbounded_Sequence_IOP_TaggedComponentList::freebuf (old);
-      
+
     }
     this->buffer_ = tmp;
   }
-  
+
   void
   IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::_deallocate_buffer (void)
   {
     if (this->buffer_ == 0 || this->release_ == 0)
       return;
-    
+
     IOP::TaggedComponent *tmp = ACE_reinterpret_cast (IOP::TaggedComponent *,this->buffer_);
-    
+
     _TAO_Unbounded_Sequence_IOP_TaggedComponentList::freebuf (tmp);
     this->buffer_ = 0;
-  } 
-  
+  }
+
   IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::~_TAO_Unbounded_Sequence_IOP_TaggedComponentList (void) // Dtor.
   {
     this->_deallocate_buffer ();
   }
-  
-  
+
+
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_IOP_TAGGEDCOMPONENTLIST_CS_)
 #define _IOP_TAGGEDCOMPONENTLIST_CS_
@@ -796,30 +797,30 @@ TAO_NAMESPACE_END
 IOP::TaggedComponentList::TaggedComponentList (void)
 {}
 IOP::TaggedComponentList::TaggedComponentList (CORBA::ULong max) // uses max size
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_IOP_TaggedComponentList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<IOP::TaggedComponent>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max)
 {}
 IOP::TaggedComponentList::TaggedComponentList (CORBA::ULong max, CORBA::ULong length, IOP::TaggedComponent *buffer, CORBA::Boolean release)
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_IOP_TaggedComponentList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<IOP::TaggedComponent>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max, length, buffer, release)
 {}
 IOP::TaggedComponentList::TaggedComponentList (const TaggedComponentList &seq) // copy ctor
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_IOP_TaggedComponentList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<IOP::TaggedComponent>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (seq)
 {}
 IOP::TaggedComponentList::~TaggedComponentList (void) // dtor
@@ -837,21 +838,21 @@ static const CORBA::Long _oc_IOP_TaggedComponentList[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   40,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x494f502f), 
-  ACE_NTOHL (0x54616767), 
-  ACE_NTOHL (0x6564436f), 
-  ACE_NTOHL (0x6d706f6e), 
-  ACE_NTOHL (0x656e744c), 
-  ACE_NTOHL (0x6973743a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x494f502f),
+  ACE_NTOHL (0x54616767),
+  ACE_NTOHL (0x6564436f),
+  ACE_NTOHL (0x6d706f6e),
+  ACE_NTOHL (0x656e744c),
+  ACE_NTOHL (0x6973743a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/TaggedComponentList:1.0
   20,
-  ACE_NTOHL (0x54616767), 
-  ACE_NTOHL (0x6564436f), 
-  ACE_NTOHL (0x6d706f6e), 
-  ACE_NTOHL (0x656e744c), 
+  ACE_NTOHL (0x54616767),
+  ACE_NTOHL (0x6564436f),
+  ACE_NTOHL (0x6d706f6e),
+  ACE_NTOHL (0x656e744c),
   ACE_NTOHL (0x69737400),  // name = TaggedComponentList
   CORBA::tk_sequence, // typecode kind
   200, // encapsulation length
@@ -860,19 +861,19 @@ static const CORBA::Long _oc_IOP_TaggedComponentList[] =
     184, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       36,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x494f502f), 
-      ACE_NTOHL (0x54616767), 
-      ACE_NTOHL (0x6564436f), 
-      ACE_NTOHL (0x6d706f6e), 
-      ACE_NTOHL (0x656e743a), 
+      ACE_NTOHL (0x49444c3a),
+      ACE_NTOHL (0x6f6d672e),
+      ACE_NTOHL (0x6f72672f),
+      ACE_NTOHL (0x494f502f),
+      ACE_NTOHL (0x54616767),
+      ACE_NTOHL (0x6564436f),
+      ACE_NTOHL (0x6d706f6e),
+      ACE_NTOHL (0x656e743a),
       ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/TaggedComponent:1.0
       16,
-      ACE_NTOHL (0x54616767), 
-      ACE_NTOHL (0x6564436f), 
-      ACE_NTOHL (0x6d706f6e), 
+      ACE_NTOHL (0x54616767),
+      ACE_NTOHL (0x6564436f),
+      ACE_NTOHL (0x6d706f6e),
       ACE_NTOHL (0x656e7400),  // name = TaggedComponent
       2, // member count
       4,
@@ -881,25 +882,25 @@ static const CORBA::Long _oc_IOP_TaggedComponentList[] =
       60, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         32,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x494f502f), 
-        ACE_NTOHL (0x436f6d70), 
-        ACE_NTOHL (0x6f6e656e), 
-        ACE_NTOHL (0x7449643a), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x494f502f),
+        ACE_NTOHL (0x436f6d70),
+        ACE_NTOHL (0x6f6e656e),
+        ACE_NTOHL (0x7449643a),
         ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/ComponentId:1.0
         12,
-        ACE_NTOHL (0x436f6d70), 
-        ACE_NTOHL (0x6f6e656e), 
+        ACE_NTOHL (0x436f6d70),
+        ACE_NTOHL (0x6f6e656e),
         ACE_NTOHL (0x74496400),  // name = ComponentId
         CORBA::tk_ulong,
 
 
       15,
-      ACE_NTOHL (0x636f6d70), 
-      ACE_NTOHL (0x6f6e656e), 
-      ACE_NTOHL (0x745f6461), 
+      ACE_NTOHL (0x636f6d70),
+      ACE_NTOHL (0x6f6e656e),
+      ACE_NTOHL (0x745f6461),
       ACE_NTOHL (0x74610000),  // name = component_data
       CORBA::tk_sequence, // typecode kind
       12, // encapsulation length
@@ -928,7 +929,7 @@ TAO_NAMESPACE_END
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_IOP_TAGGEDCOMPONENTSEQ_CS_)
 #define __TAO_UNBOUNDED_SEQUENCE_IOP_TAGGEDCOMPONENTSEQ_CS_
 
@@ -937,43 +938,43 @@ TAO_NAMESPACE_END
   {
     IOP::TaggedComponent* tmp = 0;
     tmp = _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::allocbuf (length);
-    
+
     if (this->buffer_ != 0)
     {
       IOP::TaggedComponent *old = ACE_reinterpret_cast (IOP::TaggedComponent *,this->buffer_);
-      
+
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         tmp[i] = old[i];
-      
+
       if (this->release_)
         _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::freebuf (old);
-      
+
     }
     this->buffer_ = tmp;
   }
-  
+
   void
   IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::_deallocate_buffer (void)
   {
     if (this->buffer_ == 0 || this->release_ == 0)
       return;
-    
+
     IOP::TaggedComponent *tmp = ACE_reinterpret_cast (IOP::TaggedComponent *,this->buffer_);
-    
+
     _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::freebuf (tmp);
     this->buffer_ = 0;
-  } 
-  
+  }
+
   IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::~_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq (void) // Dtor.
   {
     this->_deallocate_buffer ();
   }
-  
-  
+
+
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_IOP_TAGGEDCOMPONENTSEQ_CS_)
 #define _IOP_TAGGEDCOMPONENTSEQ_CS_
@@ -985,30 +986,30 @@ TAO_NAMESPACE_END
 IOP::TaggedComponentSeq::TaggedComponentSeq (void)
 {}
 IOP::TaggedComponentSeq::TaggedComponentSeq (CORBA::ULong max) // uses max size
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<IOP::TaggedComponent>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max)
 {}
 IOP::TaggedComponentSeq::TaggedComponentSeq (CORBA::ULong max, CORBA::ULong length, IOP::TaggedComponent *buffer, CORBA::Boolean release)
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<IOP::TaggedComponent>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max, length, buffer, release)
 {}
 IOP::TaggedComponentSeq::TaggedComponentSeq (const TaggedComponentSeq &seq) // copy ctor
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<IOP::TaggedComponent>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (seq)
 {}
 IOP::TaggedComponentSeq::~TaggedComponentSeq (void) // dtor
@@ -1026,21 +1027,21 @@ static const CORBA::Long _oc_IOP_TaggedComponentSeq[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   39,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x494f502f), 
-  ACE_NTOHL (0x54616767), 
-  ACE_NTOHL (0x6564436f), 
-  ACE_NTOHL (0x6d706f6e), 
-  ACE_NTOHL (0x656e7453), 
-  ACE_NTOHL (0x65713a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x494f502f),
+  ACE_NTOHL (0x54616767),
+  ACE_NTOHL (0x6564436f),
+  ACE_NTOHL (0x6d706f6e),
+  ACE_NTOHL (0x656e7453),
+  ACE_NTOHL (0x65713a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IOP/TaggedComponentSeq:1.0
   19,
-  ACE_NTOHL (0x54616767), 
-  ACE_NTOHL (0x6564436f), 
-  ACE_NTOHL (0x6d706f6e), 
-  ACE_NTOHL (0x656e7453), 
+  ACE_NTOHL (0x54616767),
+  ACE_NTOHL (0x6564436f),
+  ACE_NTOHL (0x6d706f6e),
+  ACE_NTOHL (0x656e7453),
   ACE_NTOHL (0x65710000),  // name = TaggedComponentSeq
   CORBA::tk_sequence, // typecode kind
   200, // encapsulation length
@@ -1049,19 +1050,19 @@ static const CORBA::Long _oc_IOP_TaggedComponentSeq[] =
     184, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       36,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x494f502f), 
-      ACE_NTOHL (0x54616767), 
-      ACE_NTOHL (0x6564436f), 
-      ACE_NTOHL (0x6d706f6e), 
-      ACE_NTOHL (0x656e743a), 
+      ACE_NTOHL (0x49444c3a),
+      ACE_NTOHL (0x6f6d672e),
+      ACE_NTOHL (0x6f72672f),
+      ACE_NTOHL (0x494f502f),
+      ACE_NTOHL (0x54616767),
+      ACE_NTOHL (0x6564436f),
+      ACE_NTOHL (0x6d706f6e),
+      ACE_NTOHL (0x656e743a),
       ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/TaggedComponent:1.0
       16,
-      ACE_NTOHL (0x54616767), 
-      ACE_NTOHL (0x6564436f), 
-      ACE_NTOHL (0x6d706f6e), 
+      ACE_NTOHL (0x54616767),
+      ACE_NTOHL (0x6564436f),
+      ACE_NTOHL (0x6d706f6e),
       ACE_NTOHL (0x656e7400),  // name = TaggedComponent
       2, // member count
       4,
@@ -1070,25 +1071,25 @@ static const CORBA::Long _oc_IOP_TaggedComponentSeq[] =
       60, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         32,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x494f502f), 
-        ACE_NTOHL (0x436f6d70), 
-        ACE_NTOHL (0x6f6e656e), 
-        ACE_NTOHL (0x7449643a), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x494f502f),
+        ACE_NTOHL (0x436f6d70),
+        ACE_NTOHL (0x6f6e656e),
+        ACE_NTOHL (0x7449643a),
         ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/ComponentId:1.0
         12,
-        ACE_NTOHL (0x436f6d70), 
-        ACE_NTOHL (0x6f6e656e), 
+        ACE_NTOHL (0x436f6d70),
+        ACE_NTOHL (0x6f6e656e),
         ACE_NTOHL (0x74496400),  // name = ComponentId
         CORBA::tk_ulong,
 
 
       15,
-      ACE_NTOHL (0x636f6d70), 
-      ACE_NTOHL (0x6f6e656e), 
-      ACE_NTOHL (0x745f6461), 
+      ACE_NTOHL (0x636f6d70),
+      ACE_NTOHL (0x6f6e656e),
+      ACE_NTOHL (0x745f6461),
       ACE_NTOHL (0x74610000),  // name = component_data
       CORBA::tk_sequence, // typecode kind
       12, // encapsulation length
@@ -1159,17 +1160,17 @@ static const CORBA::Long _oc_IOP_ServiceId[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   30,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x494f502f), 
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x69636549), 
-  ACE_NTOHL (0x643a312e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x494f502f),
+  ACE_NTOHL (0x53657276),
+  ACE_NTOHL (0x69636549),
+  ACE_NTOHL (0x643a312e),
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ServiceId:1.0
   10,
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x69636549), 
+  ACE_NTOHL (0x53657276),
+  ACE_NTOHL (0x69636549),
   ACE_NTOHL (0x64000000),  // name = ServiceId
   CORBA::tk_ulong,
 
@@ -1192,48 +1193,48 @@ static const CORBA::Long _oc_IOP_ServiceContext[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   35,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x494f502f), 
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x69636543), 
-  ACE_NTOHL (0x6f6e7465), 
-  ACE_NTOHL (0x78743a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x494f502f),
+  ACE_NTOHL (0x53657276),
+  ACE_NTOHL (0x69636543),
+  ACE_NTOHL (0x6f6e7465),
+  ACE_NTOHL (0x78743a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IOP/ServiceContext:1.0
   15,
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x69636543), 
-  ACE_NTOHL (0x6f6e7465), 
+  ACE_NTOHL (0x53657276),
+  ACE_NTOHL (0x69636543),
+  ACE_NTOHL (0x6f6e7465),
   ACE_NTOHL (0x78740000),  // name = ServiceContext
   2, // member count
   11,
-  ACE_NTOHL (0x636f6e74), 
-  ACE_NTOHL (0x6578745f), 
+  ACE_NTOHL (0x636f6e74),
+  ACE_NTOHL (0x6578745f),
   ACE_NTOHL (0x69640000),  // name = context_id
   CORBA::tk_alias, // typecode kind for typedefs
   60, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     30,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x494f502f), 
-    ACE_NTOHL (0x53657276), 
-    ACE_NTOHL (0x69636549), 
-    ACE_NTOHL (0x643a312e), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x494f502f),
+    ACE_NTOHL (0x53657276),
+    ACE_NTOHL (0x69636549),
+    ACE_NTOHL (0x643a312e),
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ServiceId:1.0
     10,
-    ACE_NTOHL (0x53657276), 
-    ACE_NTOHL (0x69636549), 
+    ACE_NTOHL (0x53657276),
+    ACE_NTOHL (0x69636549),
     ACE_NTOHL (0x64000000),  // name = ServiceId
     CORBA::tk_ulong,
 
 
   13,
-  ACE_NTOHL (0x636f6e74), 
-  ACE_NTOHL (0x6578745f), 
-  ACE_NTOHL (0x64617461), 
+  ACE_NTOHL (0x636f6e74),
+  ACE_NTOHL (0x6578745f),
+  ACE_NTOHL (0x64617461),
   ACE_NTOHL (0x0),  // name = context_data
   CORBA::tk_sequence, // typecode kind
   12, // encapsulation length
@@ -1274,30 +1275,30 @@ void IOP::ServiceContext::_tao_any_destructor (void *x)
 IOP::ServiceContext::_tao_seq_Octet::_tao_seq_Octet (void)
 {}
 IOP::ServiceContext::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max) // uses max size
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   TAO_Unbounded_Sequence<CORBA::Octet>
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<CORBA::Octet>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max)
 {}
 IOP::ServiceContext::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max, CORBA::ULong length, CORBA::Octet *buffer, CORBA::Boolean release)
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   TAO_Unbounded_Sequence<CORBA::Octet>
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<CORBA::Octet>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max, length, buffer, release)
 {}
 IOP::ServiceContext::_tao_seq_Octet::_tao_seq_Octet (const _tao_seq_Octet &seq) // copy ctor
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   TAO_Unbounded_Sequence<CORBA::Octet>
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<CORBA::Octet>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (seq)
 {}
 IOP::ServiceContext::_tao_seq_Octet::~_tao_seq_Octet (void) // dtor
@@ -1313,7 +1314,7 @@ void IOP::ServiceContext::_tao_seq_Octet::_tao_any_destructor (void *x)
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_IOP_SERVICECONTEXTLIST_CS_)
 #define __TAO_UNBOUNDED_SEQUENCE_IOP_SERVICECONTEXTLIST_CS_
 
@@ -1322,43 +1323,43 @@ void IOP::ServiceContext::_tao_seq_Octet::_tao_any_destructor (void *x)
   {
     IOP::ServiceContext* tmp = 0;
     tmp = _TAO_Unbounded_Sequence_IOP_ServiceContextList::allocbuf (length);
-    
+
     if (this->buffer_ != 0)
     {
       IOP::ServiceContext *old = ACE_reinterpret_cast (IOP::ServiceContext *,this->buffer_);
-      
+
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         tmp[i] = old[i];
-      
+
       if (this->release_)
         _TAO_Unbounded_Sequence_IOP_ServiceContextList::freebuf (old);
-      
+
     }
     this->buffer_ = tmp;
   }
-  
+
   void
   IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::_deallocate_buffer (void)
   {
     if (this->buffer_ == 0 || this->release_ == 0)
       return;
-    
+
     IOP::ServiceContext *tmp = ACE_reinterpret_cast (IOP::ServiceContext *,this->buffer_);
-    
+
     _TAO_Unbounded_Sequence_IOP_ServiceContextList::freebuf (tmp);
     this->buffer_ = 0;
-  } 
-  
+  }
+
   IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::~_TAO_Unbounded_Sequence_IOP_ServiceContextList (void) // Dtor.
   {
     this->_deallocate_buffer ();
   }
-  
-  
+
+
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_IOP_SERVICECONTEXTLIST_CS_)
 #define _IOP_SERVICECONTEXTLIST_CS_
@@ -1370,30 +1371,30 @@ void IOP::ServiceContext::_tao_seq_Octet::_tao_any_destructor (void *x)
 IOP::ServiceContextList::ServiceContextList (void)
 {}
 IOP::ServiceContextList::ServiceContextList (CORBA::ULong max) // uses max size
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_IOP_ServiceContextList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<IOP::ServiceContext>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max)
 {}
 IOP::ServiceContextList::ServiceContextList (CORBA::ULong max, CORBA::ULong length, IOP::ServiceContext *buffer, CORBA::Boolean release)
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_IOP_ServiceContextList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<IOP::ServiceContext>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max, length, buffer, release)
 {}
 IOP::ServiceContextList::ServiceContextList (const ServiceContextList &seq) // copy ctor
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_IOP_ServiceContextList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<IOP::ServiceContext>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (seq)
 {}
 IOP::ServiceContextList::~ServiceContextList (void) // dtor
@@ -1411,21 +1412,21 @@ static const CORBA::Long _oc_IOP_ServiceContextList[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   39,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x494f502f), 
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x69636543), 
-  ACE_NTOHL (0x6f6e7465), 
-  ACE_NTOHL (0x78744c69), 
-  ACE_NTOHL (0x73743a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x494f502f),
+  ACE_NTOHL (0x53657276),
+  ACE_NTOHL (0x69636543),
+  ACE_NTOHL (0x6f6e7465),
+  ACE_NTOHL (0x78744c69),
+  ACE_NTOHL (0x73743a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IOP/ServiceContextList:1.0
   19,
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x69636543), 
-  ACE_NTOHL (0x6f6e7465), 
-  ACE_NTOHL (0x78744c69), 
+  ACE_NTOHL (0x53657276),
+  ACE_NTOHL (0x69636543),
+  ACE_NTOHL (0x6f6e7465),
+  ACE_NTOHL (0x78744c69),
   ACE_NTOHL (0x73740000),  // name = ServiceContextList
   CORBA::tk_sequence, // typecode kind
   208, // encapsulation length
@@ -1434,48 +1435,48 @@ static const CORBA::Long _oc_IOP_ServiceContextList[] =
     192, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       35,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x494f502f), 
-      ACE_NTOHL (0x53657276), 
-      ACE_NTOHL (0x69636543), 
-      ACE_NTOHL (0x6f6e7465), 
-      ACE_NTOHL (0x78743a31), 
+      ACE_NTOHL (0x49444c3a),
+      ACE_NTOHL (0x6f6d672e),
+      ACE_NTOHL (0x6f72672f),
+      ACE_NTOHL (0x494f502f),
+      ACE_NTOHL (0x53657276),
+      ACE_NTOHL (0x69636543),
+      ACE_NTOHL (0x6f6e7465),
+      ACE_NTOHL (0x78743a31),
       ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IOP/ServiceContext:1.0
       15,
-      ACE_NTOHL (0x53657276), 
-      ACE_NTOHL (0x69636543), 
-      ACE_NTOHL (0x6f6e7465), 
+      ACE_NTOHL (0x53657276),
+      ACE_NTOHL (0x69636543),
+      ACE_NTOHL (0x6f6e7465),
       ACE_NTOHL (0x78740000),  // name = ServiceContext
       2, // member count
       11,
-      ACE_NTOHL (0x636f6e74), 
-      ACE_NTOHL (0x6578745f), 
+      ACE_NTOHL (0x636f6e74),
+      ACE_NTOHL (0x6578745f),
       ACE_NTOHL (0x69640000),  // name = context_id
       CORBA::tk_alias, // typecode kind for typedefs
       60, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         30,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x494f502f), 
-        ACE_NTOHL (0x53657276), 
-        ACE_NTOHL (0x69636549), 
-        ACE_NTOHL (0x643a312e), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x494f502f),
+        ACE_NTOHL (0x53657276),
+        ACE_NTOHL (0x69636549),
+        ACE_NTOHL (0x643a312e),
         ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ServiceId:1.0
         10,
-        ACE_NTOHL (0x53657276), 
-        ACE_NTOHL (0x69636549), 
+        ACE_NTOHL (0x53657276),
+        ACE_NTOHL (0x69636549),
         ACE_NTOHL (0x64000000),  // name = ServiceId
         CORBA::tk_ulong,
 
 
       13,
-      ACE_NTOHL (0x636f6e74), 
-      ACE_NTOHL (0x6578745f), 
-      ACE_NTOHL (0x64617461), 
+      ACE_NTOHL (0x636f6e74),
+      ACE_NTOHL (0x6578745f),
+      ACE_NTOHL (0x64617461),
       ACE_NTOHL (0x0),  // name = context_data
       CORBA::tk_sequence, // typecode kind
       12, // encapsulation length
@@ -1614,7 +1615,7 @@ IOP::Codec_var::operator const ::IOP::Codec_ptr &() const // cast
   return this->ptr_;
 }
 
-IOP::Codec_var::operator ::IOP::Codec_ptr &() // cast 
+IOP::Codec_var::operator ::IOP::Codec_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -1690,7 +1691,7 @@ IOP::Codec_var::upcast (void *src)
 }
 
 // *************************************************************
-// Inline operations for class IOP::Codec_out
+// Operations for class IOP::Codec_out
 // *************************************************************
 
 IOP::Codec_out::Codec_out (Codec_ptr &p)
@@ -1806,7 +1807,7 @@ void *IOP::Codec::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-    
+
   if (retv)
     this->_add_ref ();
   return retv;
@@ -2025,19 +2026,19 @@ static const CORBA::Long _oc_IOP_EncodingFormat[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   35,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x494f502f), 
-  ACE_NTOHL (0x456e636f), 
-  ACE_NTOHL (0x64696e67), 
-  ACE_NTOHL (0x466f726d), 
-  ACE_NTOHL (0x61743a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x494f502f),
+  ACE_NTOHL (0x456e636f),
+  ACE_NTOHL (0x64696e67),
+  ACE_NTOHL (0x466f726d),
+  ACE_NTOHL (0x61743a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IOP/EncodingFormat:1.0
   15,
-  ACE_NTOHL (0x456e636f), 
-  ACE_NTOHL (0x64696e67), 
-  ACE_NTOHL (0x466f726d), 
+  ACE_NTOHL (0x456e636f),
+  ACE_NTOHL (0x64696e67),
+  ACE_NTOHL (0x466f726d),
   ACE_NTOHL (0x61740000),  // name = EncodingFormat
   CORBA::tk_short,
 
@@ -2064,54 +2065,54 @@ static const CORBA::Long _oc_IOP_Encoding[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   29,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x494f502f), 
-  ACE_NTOHL (0x456e636f), 
-  ACE_NTOHL (0x64696e67), 
-  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x494f502f),
+  ACE_NTOHL (0x456e636f),
+  ACE_NTOHL (0x64696e67),
+  ACE_NTOHL (0x3a312e30),
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IOP/Encoding:1.0
   9,
-  ACE_NTOHL (0x456e636f), 
-  ACE_NTOHL (0x64696e67), 
+  ACE_NTOHL (0x456e636f),
+  ACE_NTOHL (0x64696e67),
   ACE_NTOHL (0x0),  // name = Encoding
   3, // member count
   7,
-  ACE_NTOHL (0x666f726d), 
+  ACE_NTOHL (0x666f726d),
   ACE_NTOHL (0x61740000),  // name = format
   CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x494f502f), 
-    ACE_NTOHL (0x456e636f), 
-    ACE_NTOHL (0x64696e67), 
-    ACE_NTOHL (0x466f726d), 
-    ACE_NTOHL (0x61743a31), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x494f502f),
+    ACE_NTOHL (0x456e636f),
+    ACE_NTOHL (0x64696e67),
+    ACE_NTOHL (0x466f726d),
+    ACE_NTOHL (0x61743a31),
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IOP/EncodingFormat:1.0
     15,
-    ACE_NTOHL (0x456e636f), 
-    ACE_NTOHL (0x64696e67), 
-    ACE_NTOHL (0x466f726d), 
+    ACE_NTOHL (0x456e636f),
+    ACE_NTOHL (0x64696e67),
+    ACE_NTOHL (0x466f726d),
     ACE_NTOHL (0x61740000),  // name = EncodingFormat
     CORBA::tk_short,
 
 
   14,
-  ACE_NTOHL (0x6d616a6f), 
-  ACE_NTOHL (0x725f7665), 
-  ACE_NTOHL (0x7273696f), 
+  ACE_NTOHL (0x6d616a6f),
+  ACE_NTOHL (0x725f7665),
+  ACE_NTOHL (0x7273696f),
   ACE_NTOHL (0x6e000000),  // name = major_version
   CORBA::tk_octet,
 
   14,
-  ACE_NTOHL (0x6d696e6f), 
-  ACE_NTOHL (0x725f7665), 
-  ACE_NTOHL (0x7273696f), 
+  ACE_NTOHL (0x6d696e6f),
+  ACE_NTOHL (0x725f7665),
+  ACE_NTOHL (0x7273696f),
   ACE_NTOHL (0x6e000000),  // name = minor_version
   CORBA::tk_octet,
 
@@ -2184,7 +2185,7 @@ IOP::CodecFactory_var::operator const ::IOP::CodecFactory_ptr &() const // cast
   return this->ptr_;
 }
 
-IOP::CodecFactory_var::operator ::IOP::CodecFactory_ptr &() // cast 
+IOP::CodecFactory_var::operator ::IOP::CodecFactory_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -2260,7 +2261,7 @@ IOP::CodecFactory_var::upcast (void *src)
 }
 
 // *************************************************************
-// Inline operations for class IOP::CodecFactory_out
+// Operations for class IOP::CodecFactory_out
 // *************************************************************
 
 IOP::CodecFactory_out::CodecFactory_out (CodecFactory_ptr &p)
@@ -2376,7 +2377,7 @@ void *IOP::CodecFactory::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-    
+
   if (retv)
     this->_add_ref ();
   return retv;
@@ -2491,13 +2492,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IOP::TaggedProfile
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (IOP::_tc_TaggedProfile, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -2574,13 +2575,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IOP::IOR *&_tao_el
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (IOP::_tc_IOR, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -2657,13 +2658,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IOP::TaggedCompone
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (IOP::_tc_TaggedComponent, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -2748,13 +2749,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IOP::MultipleCompo
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (IOP::_tc_MultipleComponentProfile, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -2839,13 +2840,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IOP::TaggedCompone
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (IOP::_tc_TaggedComponentList, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -2930,13 +2931,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IOP::TaggedCompone
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (IOP::_tc_TaggedComponentSeq, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -3013,13 +3014,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IOP::ServiceContex
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (IOP::_tc_ServiceContext, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -3104,13 +3105,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IOP::ServiceContex
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (IOP::_tc_ServiceContextList, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -3194,13 +3195,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IOP::Encoding *&_t
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
+
     CORBA::Boolean result = type->equivalent (IOP::_tc_Encoding, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -3260,20 +3261,20 @@ CORBA::Boolean operator<< (
   if (strm << _tao_sequence.length ())
   {
     // encode all elements
-    
+
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
     {
-      TAO_Unbounded_Sequence<CORBA::Octet> *oseq = 
+      TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
         ACE_static_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (IOP::TaggedProfile::_tao_seq_Octet *)&_tao_sequence);
       if (oseq->mb ())
         return strm.write_octet_array_mb (oseq->mb ());
       else
         return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
     }
-    
+
 #else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
     return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-  
+
 #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
   }
   return 0; // error
@@ -3290,26 +3291,31 @@ CORBA::Boolean operator>> (
     // set the length of the sequence
     _tao_sequence.length (_tao_seq_len);
     // If length is 0 we return true.
-    if (0 >= _tao_seq_len) 
+    if (0 >= _tao_seq_len)
       return 1;
     // retrieve all the elements
-    
+
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
-    if (ACE_BIT_DISABLED (strm.start ()->flags (),ACE_Message_Block::DONT_DELETE))
+    if (ACE_BIT_DISABLED (strm.start ()->flags (),
+    ACE_Message_Block::DONT_DELETE))
     {
-      TAO_Unbounded_Sequence<CORBA::Octet> *oseq = 
-        ACE_static_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence);
-      oseq->replace (_tao_seq_len, strm.start ());
-      oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len);
-      strm.skip_bytes (_tao_seq_len);
-      return 1;
+      TAO_ORB_Core* orb_core = strm.orb_core ();
+      if (orb_core != 0 &&
+      strm.orb_core ()->resource_factory ()->
+      input_cdr_allocator_type_locked () == 1)
+      {
+        TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
+          ACE_static_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence);
+        oseq->replace (_tao_seq_len, strm.start ());
+        oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len);
+        strm.skip_bytes (_tao_seq_len);
+        return 1;
+      }
     }
-    else
-      return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len);
-    
+    return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len);
 #else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
     return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-  
+
 #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
   }
   return 0; // error
@@ -3350,7 +3356,7 @@ CORBA::Boolean operator>> (
     // set the length of the sequence
     _tao_sequence.length (_tao_seq_len);
     // If length is 0 we return true.
-    if (0 >= _tao_seq_len) 
+    if (0 >= _tao_seq_len)
       return 1;
     // retrieve all the elements
     CORBA::Boolean _tao_marshal_flag = 1;
@@ -3377,20 +3383,20 @@ CORBA::Boolean operator<< (
   if (strm << _tao_sequence.length ())
   {
     // encode all elements
-    
+
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
     {
-      TAO_Unbounded_Sequence<CORBA::Octet> *oseq = 
+      TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
         ACE_static_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (IOP::TaggedComponent::_tao_seq_Octet *)&_tao_sequence);
       if (oseq->mb ())
         return strm.write_octet_array_mb (oseq->mb ());
       else
         return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
     }
-    
+
 #else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
     return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-  
+
 #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
   }
   return 0; // error
@@ -3407,26 +3413,31 @@ CORBA::Boolean operator>> (
     // set the length of the sequence
     _tao_sequence.length (_tao_seq_len);
     // If length is 0 we return true.
-    if (0 >= _tao_seq_len) 
+    if (0 >= _tao_seq_len)
       return 1;
     // retrieve all the elements
-    
+
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
-    if (ACE_BIT_DISABLED (strm.start ()->flags (),ACE_Message_Block::DONT_DELETE))
+    if (ACE_BIT_DISABLED (strm.start ()->flags (),
+    ACE_Message_Block::DONT_DELETE))
     {
-      TAO_Unbounded_Sequence<CORBA::Octet> *oseq = 
-        ACE_static_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence);
-      oseq->replace (_tao_seq_len, strm.start ());
-      oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len);
-      strm.skip_bytes (_tao_seq_len);
-      return 1;
+      TAO_ORB_Core* orb_core = strm.orb_core ();
+      if (orb_core != 0 &&
+      strm.orb_core ()->resource_factory ()->
+      input_cdr_allocator_type_locked () == 1)
+      {
+        TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
+          ACE_static_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence);
+        oseq->replace (_tao_seq_len, strm.start ());
+        oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len);
+        strm.skip_bytes (_tao_seq_len);
+        return 1;
+      }
     }
-    else
-      return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len);
-    
+    return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len);
 #else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
     return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-  
+
 #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
   }
   return 0; // error
@@ -3463,7 +3474,7 @@ CORBA::Boolean operator>> (
     // set the length of the sequence
     _tao_sequence.length (_tao_seq_len);
     // If length is 0 we return true.
-    if (0 >= _tao_seq_len) 
+    if (0 >= _tao_seq_len)
       return 1;
     // retrieve all the elements
     CORBA::Boolean _tao_marshal_flag = 1;
@@ -3505,7 +3516,7 @@ CORBA::Boolean operator>> (
     // set the length of the sequence
     _tao_sequence.length (_tao_seq_len);
     // If length is 0 we return true.
-    if (0 >= _tao_seq_len) 
+    if (0 >= _tao_seq_len)
       return 1;
     // retrieve all the elements
     CORBA::Boolean _tao_marshal_flag = 1;
@@ -3547,7 +3558,7 @@ CORBA::Boolean operator>> (
     // set the length of the sequence
     _tao_sequence.length (_tao_seq_len);
     // If length is 0 we return true.
-    if (0 >= _tao_seq_len) 
+    if (0 >= _tao_seq_len)
       return 1;
     // retrieve all the elements
     CORBA::Boolean _tao_marshal_flag = 1;
@@ -3572,20 +3583,20 @@ CORBA::Boolean operator<< (
   if (strm << _tao_sequence.length ())
   {
     // encode all elements
-    
+
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
     {
-      TAO_Unbounded_Sequence<CORBA::Octet> *oseq = 
+      TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
         ACE_static_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (IOP::ServiceContext::_tao_seq_Octet *)&_tao_sequence);
       if (oseq->mb ())
         return strm.write_octet_array_mb (oseq->mb ());
       else
         return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
     }
-    
+
 #else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
     return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-  
+
 #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
   }
   return 0; // error
@@ -3602,26 +3613,31 @@ CORBA::Boolean operator>> (
     // set the length of the sequence
     _tao_sequence.length (_tao_seq_len);
     // If length is 0 we return true.
-    if (0 >= _tao_seq_len) 
+    if (0 >= _tao_seq_len)
       return 1;
     // retrieve all the elements
-    
+
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
-    if (ACE_BIT_DISABLED (strm.start ()->flags (),ACE_Message_Block::DONT_DELETE))
+    if (ACE_BIT_DISABLED (strm.start ()->flags (),
+    ACE_Message_Block::DONT_DELETE))
     {
-      TAO_Unbounded_Sequence<CORBA::Octet> *oseq = 
-        ACE_static_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence);
-      oseq->replace (_tao_seq_len, strm.start ());
-      oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len);
-      strm.skip_bytes (_tao_seq_len);
-      return 1;
+      TAO_ORB_Core* orb_core = strm.orb_core ();
+      if (orb_core != 0 &&
+      strm.orb_core ()->resource_factory ()->
+      input_cdr_allocator_type_locked () == 1)
+      {
+        TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
+          ACE_static_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence);
+        oseq->replace (_tao_seq_len, strm.start ());
+        oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len);
+        strm.skip_bytes (_tao_seq_len);
+        return 1;
+      }
     }
-    else
-      return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len);
-    
+    return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len);
 #else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
     return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-  
+
 #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
   }
   return 0; // error
@@ -3658,7 +3674,7 @@ CORBA::Boolean operator>> (
     // set the length of the sequence
     _tao_sequence.length (_tao_seq_len);
     // If length is 0 we return true.
-    if (0 >= _tao_seq_len) 
+    if (0 >= _tao_seq_len)
       return 1;
     // retrieve all the elements
     CORBA::Boolean _tao_marshal_flag = 1;
@@ -3670,4 +3686,3 @@ CORBA::Boolean operator>> (
   }
   return 0; // error
 }
-
diff --git a/TAO/tao/MessagingC.cpp b/TAO/tao/MessagingC.cpp
index b891895b805..8faec91bace 100644
--- a/TAO/tao/MessagingC.cpp
+++ b/TAO/tao/MessagingC.cpp
@@ -89,18 +89,18 @@ static const CORBA::Long _oc_Messaging_SyncScope[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   36,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x4d657373),
-  ACE_NTOHL (0x6167696e),
-  ACE_NTOHL (0x672f5379),
-  ACE_NTOHL (0x6e635363),
-  ACE_NTOHL (0x6f70653a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x4d657373), 
+  ACE_NTOHL (0x6167696e), 
+  ACE_NTOHL (0x672f5379), 
+  ACE_NTOHL (0x6e635363), 
+  ACE_NTOHL (0x6f70653a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/Messaging/SyncScope:1.0
   10,
-  ACE_NTOHL (0x53796e63),
-  ACE_NTOHL (0x53636f70),
+  ACE_NTOHL (0x53796e63), 
+  ACE_NTOHL (0x53636f70), 
   ACE_NTOHL (0x65000000),  // name = SyncScope
   CORBA::tk_short,
 
@@ -147,19 +147,19 @@ static const CORBA::Long _oc_Messaging_RoutingType[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   38,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x4d657373),
-  ACE_NTOHL (0x6167696e),
-  ACE_NTOHL (0x672f526f),
-  ACE_NTOHL (0x7574696e),
-  ACE_NTOHL (0x67547970),
-  ACE_NTOHL (0x653a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x4d657373), 
+  ACE_NTOHL (0x6167696e), 
+  ACE_NTOHL (0x672f526f), 
+  ACE_NTOHL (0x7574696e), 
+  ACE_NTOHL (0x67547970), 
+  ACE_NTOHL (0x653a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Messaging/RoutingType:1.0
   12,
-  ACE_NTOHL (0x526f7574),
-  ACE_NTOHL (0x696e6754),
+  ACE_NTOHL (0x526f7574), 
+  ACE_NTOHL (0x696e6754), 
   ACE_NTOHL (0x79706500),  // name = RoutingType
   CORBA::tk_short,
 
@@ -194,32 +194,32 @@ static const CORBA::Long _oc_Messaging_Timeout[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   34,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x4d657373),
-  ACE_NTOHL (0x6167696e),
-  ACE_NTOHL (0x672f5469),
-  ACE_NTOHL (0x6d656f75),
-  ACE_NTOHL (0x743a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x4d657373), 
+  ACE_NTOHL (0x6167696e), 
+  ACE_NTOHL (0x672f5469), 
+  ACE_NTOHL (0x6d656f75), 
+  ACE_NTOHL (0x743a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Messaging/Timeout:1.0
   8,
-  ACE_NTOHL (0x54696d65),
+  ACE_NTOHL (0x54696d65), 
   ACE_NTOHL (0x6f757400),  // name = Timeout
   CORBA::tk_alias, // typecode kind for typedefs
   56, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     31,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x54696d65),
-    ACE_NTOHL (0x42617365),
-    ACE_NTOHL (0x2f54696d),
-    ACE_NTOHL (0x65543a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x54696d65), 
+    ACE_NTOHL (0x42617365), 
+    ACE_NTOHL (0x2f54696d), 
+    ACE_NTOHL (0x65543a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/TimeBase/TimeT:1.0
     6,
-    ACE_NTOHL (0x54696d65),
+    ACE_NTOHL (0x54696d65), 
     ACE_NTOHL (0x54000000),  // name = TimeT
     CORBA::tk_ulonglong,
 
@@ -243,18 +243,18 @@ static const CORBA::Long _oc_Messaging_Priority[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   35,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x4d657373),
-  ACE_NTOHL (0x6167696e),
-  ACE_NTOHL (0x672f5072),
-  ACE_NTOHL (0x696f7269),
-  ACE_NTOHL (0x74793a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x4d657373), 
+  ACE_NTOHL (0x6167696e), 
+  ACE_NTOHL (0x672f5072), 
+  ACE_NTOHL (0x696f7269), 
+  ACE_NTOHL (0x74793a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/Messaging/Priority:1.0
   9,
-  ACE_NTOHL (0x5072696f),
-  ACE_NTOHL (0x72697479),
+  ACE_NTOHL (0x5072696f), 
+  ACE_NTOHL (0x72697479), 
   ACE_NTOHL (0x0),  // name = Priority
   CORBA::tk_short,
 
@@ -277,18 +277,18 @@ static const CORBA::Long _oc_Messaging_Ordering[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   35,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x4d657373),
-  ACE_NTOHL (0x6167696e),
-  ACE_NTOHL (0x672f4f72),
-  ACE_NTOHL (0x64657269),
-  ACE_NTOHL (0x6e673a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x4d657373), 
+  ACE_NTOHL (0x6167696e), 
+  ACE_NTOHL (0x672f4f72), 
+  ACE_NTOHL (0x64657269), 
+  ACE_NTOHL (0x6e673a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/Messaging/Ordering:1.0
   9,
-  ACE_NTOHL (0x4f726465),
-  ACE_NTOHL (0x72696e67),
+  ACE_NTOHL (0x4f726465), 
+  ACE_NTOHL (0x72696e67), 
   ACE_NTOHL (0x0),  // name = Ordering
   CORBA::tk_ushort,
 
@@ -454,7 +454,7 @@ Messaging::RebindPolicy_var::upcast (void *src)
   return *tmp;
 }
 // *************************************************************
-// Inline operations for class Messaging::RebindPolicy_out
+// Operations for class Messaging::RebindPolicy_out
 // *************************************************************
 
 Messaging::RebindPolicy_out::RebindPolicy_out (RebindPolicy_ptr &p)
@@ -582,7 +582,7 @@ void *Messaging::RebindPolicy::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-
+    
   if (retv)
     this->_add_ref ();
   return retv;
@@ -725,7 +725,7 @@ Messaging::SyncScopePolicy_var::upcast (void *src)
   return *tmp;
 }
 // *************************************************************
-// Inline operations for class Messaging::SyncScopePolicy_out
+// Operations for class Messaging::SyncScopePolicy_out
 // *************************************************************
 
 Messaging::SyncScopePolicy_out::SyncScopePolicy_out (SyncScopePolicy_ptr &p)
@@ -852,7 +852,7 @@ void *Messaging::SyncScopePolicy::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-
+    
   if (retv)
     this->_add_ref ();
   return retv;
@@ -875,20 +875,20 @@ static const CORBA::Long _oc_Messaging_PriorityRange[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   40,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x4d657373),
-  ACE_NTOHL (0x6167696e),
-  ACE_NTOHL (0x672f5072),
-  ACE_NTOHL (0x696f7269),
-  ACE_NTOHL (0x74795261),
-  ACE_NTOHL (0x6e67653a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x4d657373), 
+  ACE_NTOHL (0x6167696e), 
+  ACE_NTOHL (0x672f5072), 
+  ACE_NTOHL (0x696f7269), 
+  ACE_NTOHL (0x74795261), 
+  ACE_NTOHL (0x6e67653a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/Messaging/PriorityRange:1.0
   14,
-  ACE_NTOHL (0x5072696f),
-  ACE_NTOHL (0x72697479),
-  ACE_NTOHL (0x52616e67),
+  ACE_NTOHL (0x5072696f), 
+  ACE_NTOHL (0x72697479), 
+  ACE_NTOHL (0x52616e67), 
   ACE_NTOHL (0x65000000),  // name = PriorityRange
   2, // member count
   4,
@@ -897,18 +897,18 @@ static const CORBA::Long _oc_Messaging_PriorityRange[] =
   64, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x4d657373),
-    ACE_NTOHL (0x6167696e),
-    ACE_NTOHL (0x672f5072),
-    ACE_NTOHL (0x696f7269),
-    ACE_NTOHL (0x74793a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x4d657373), 
+    ACE_NTOHL (0x6167696e), 
+    ACE_NTOHL (0x672f5072), 
+    ACE_NTOHL (0x696f7269), 
+    ACE_NTOHL (0x74793a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/Messaging/Priority:1.0
     9,
-    ACE_NTOHL (0x5072696f),
-    ACE_NTOHL (0x72697479),
+    ACE_NTOHL (0x5072696f), 
+    ACE_NTOHL (0x72697479), 
     ACE_NTOHL (0x0),  // name = Priority
     CORBA::tk_short,
 
@@ -919,18 +919,18 @@ static const CORBA::Long _oc_Messaging_PriorityRange[] =
   64, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x4d657373),
-    ACE_NTOHL (0x6167696e),
-    ACE_NTOHL (0x672f5072),
-    ACE_NTOHL (0x696f7269),
-    ACE_NTOHL (0x74793a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x4d657373), 
+    ACE_NTOHL (0x6167696e), 
+    ACE_NTOHL (0x672f5072), 
+    ACE_NTOHL (0x696f7269), 
+    ACE_NTOHL (0x74793a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/Messaging/Priority:1.0
     9,
-    ACE_NTOHL (0x5072696f),
-    ACE_NTOHL (0x72697479),
+    ACE_NTOHL (0x5072696f), 
+    ACE_NTOHL (0x72697479), 
     ACE_NTOHL (0x0),  // name = Priority
     CORBA::tk_short,
 
@@ -1080,7 +1080,7 @@ Messaging::RequestPriorityPolicy_var::upcast (void *src)
   return *tmp;
 }
 // *************************************************************
-// Inline operations for class Messaging::RequestPriorityPolicy_out
+// Operations for class Messaging::RequestPriorityPolicy_out
 // *************************************************************
 
 Messaging::RequestPriorityPolicy_out::RequestPriorityPolicy_out (RequestPriorityPolicy_ptr &p)
@@ -1208,7 +1208,7 @@ void *Messaging::RequestPriorityPolicy::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-
+    
   if (retv)
     this->_add_ref ();
   return retv;
@@ -1347,7 +1347,7 @@ Messaging::ReplyPriorityPolicy_var::upcast (void *src)
   return *tmp;
 }
 // *************************************************************
-// Inline operations for class Messaging::ReplyPriorityPolicy_out
+// Operations for class Messaging::ReplyPriorityPolicy_out
 // *************************************************************
 
 Messaging::ReplyPriorityPolicy_out::ReplyPriorityPolicy_out (ReplyPriorityPolicy_ptr &p)
@@ -1475,7 +1475,7 @@ void *Messaging::ReplyPriorityPolicy::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-
+    
   if (retv)
     this->_add_ref ();
   return retv;
@@ -1618,7 +1618,7 @@ Messaging::RequestStartTimePolicy_var::upcast (void *src)
   return *tmp;
 }
 // *************************************************************
-// Inline operations for class Messaging::RequestStartTimePolicy_out
+// Operations for class Messaging::RequestStartTimePolicy_out
 // *************************************************************
 
 Messaging::RequestStartTimePolicy_out::RequestStartTimePolicy_out (RequestStartTimePolicy_ptr &p)
@@ -1746,7 +1746,7 @@ void *Messaging::RequestStartTimePolicy::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-
+    
   if (retv)
     this->_add_ref ();
   return retv;
@@ -1889,7 +1889,7 @@ Messaging::RequestEndTimePolicy_var::upcast (void *src)
   return *tmp;
 }
 // *************************************************************
-// Inline operations for class Messaging::RequestEndTimePolicy_out
+// Operations for class Messaging::RequestEndTimePolicy_out
 // *************************************************************
 
 Messaging::RequestEndTimePolicy_out::RequestEndTimePolicy_out (RequestEndTimePolicy_ptr &p)
@@ -2017,7 +2017,7 @@ void *Messaging::RequestEndTimePolicy::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-
+    
   if (retv)
     this->_add_ref ();
   return retv;
@@ -2160,7 +2160,7 @@ Messaging::ReplyStartTimePolicy_var::upcast (void *src)
   return *tmp;
 }
 // *************************************************************
-// Inline operations for class Messaging::ReplyStartTimePolicy_out
+// Operations for class Messaging::ReplyStartTimePolicy_out
 // *************************************************************
 
 Messaging::ReplyStartTimePolicy_out::ReplyStartTimePolicy_out (ReplyStartTimePolicy_ptr &p)
@@ -2288,7 +2288,7 @@ void *Messaging::ReplyStartTimePolicy::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-
+    
   if (retv)
     this->_add_ref ();
   return retv;
@@ -2431,7 +2431,7 @@ Messaging::ReplyEndTimePolicy_var::upcast (void *src)
   return *tmp;
 }
 // *************************************************************
-// Inline operations for class Messaging::ReplyEndTimePolicy_out
+// Operations for class Messaging::ReplyEndTimePolicy_out
 // *************************************************************
 
 Messaging::ReplyEndTimePolicy_out::ReplyEndTimePolicy_out (ReplyEndTimePolicy_ptr &p)
@@ -2559,7 +2559,7 @@ void *Messaging::ReplyEndTimePolicy::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-
+    
   if (retv)
     this->_add_ref ();
   return retv;
@@ -2702,7 +2702,7 @@ Messaging::RelativeRequestTimeoutPolicy_var::upcast (void *src)
   return *tmp;
 }
 // *************************************************************
-// Inline operations for class Messaging::RelativeRequestTimeoutPolicy_out
+// Operations for class Messaging::RelativeRequestTimeoutPolicy_out
 // *************************************************************
 
 Messaging::RelativeRequestTimeoutPolicy_out::RelativeRequestTimeoutPolicy_out (RelativeRequestTimeoutPolicy_ptr &p)
@@ -2830,7 +2830,7 @@ void *Messaging::RelativeRequestTimeoutPolicy::_tao_QueryInterface (ptr_arith_t
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-
+    
   if (retv)
     this->_add_ref ();
   return retv;
@@ -2973,7 +2973,7 @@ Messaging::RelativeRoundtripTimeoutPolicy_var::upcast (void *src)
   return *tmp;
 }
 // *************************************************************
-// Inline operations for class Messaging::RelativeRoundtripTimeoutPolicy_out
+// Operations for class Messaging::RelativeRoundtripTimeoutPolicy_out
 // *************************************************************
 
 Messaging::RelativeRoundtripTimeoutPolicy_out::RelativeRoundtripTimeoutPolicy_out (RelativeRoundtripTimeoutPolicy_ptr &p)
@@ -3101,7 +3101,7 @@ void *Messaging::RelativeRoundtripTimeoutPolicy::_tao_QueryInterface (ptr_arith_
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-
+    
   if (retv)
     this->_add_ref ();
   return retv;
@@ -3124,22 +3124,22 @@ static const CORBA::Long _oc_Messaging_RoutingTypeRange[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   43,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x4d657373),
-  ACE_NTOHL (0x6167696e),
-  ACE_NTOHL (0x672f526f),
-  ACE_NTOHL (0x7574696e),
-  ACE_NTOHL (0x67547970),
-  ACE_NTOHL (0x6552616e),
-  ACE_NTOHL (0x67653a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x4d657373), 
+  ACE_NTOHL (0x6167696e), 
+  ACE_NTOHL (0x672f526f), 
+  ACE_NTOHL (0x7574696e), 
+  ACE_NTOHL (0x67547970), 
+  ACE_NTOHL (0x6552616e), 
+  ACE_NTOHL (0x67653a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/Messaging/RoutingTypeRange:1.0
   17,
-  ACE_NTOHL (0x526f7574),
-  ACE_NTOHL (0x696e6754),
-  ACE_NTOHL (0x79706552),
-  ACE_NTOHL (0x616e6765),
+  ACE_NTOHL (0x526f7574), 
+  ACE_NTOHL (0x696e6754), 
+  ACE_NTOHL (0x79706552), 
+  ACE_NTOHL (0x616e6765), 
   ACE_NTOHL (0x0),  // name = RoutingTypeRange
   2, // member count
   4,
@@ -3148,19 +3148,19 @@ static const CORBA::Long _oc_Messaging_RoutingTypeRange[] =
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     38,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x4d657373),
-    ACE_NTOHL (0x6167696e),
-    ACE_NTOHL (0x672f526f),
-    ACE_NTOHL (0x7574696e),
-    ACE_NTOHL (0x67547970),
-    ACE_NTOHL (0x653a312e),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x4d657373), 
+    ACE_NTOHL (0x6167696e), 
+    ACE_NTOHL (0x672f526f), 
+    ACE_NTOHL (0x7574696e), 
+    ACE_NTOHL (0x67547970), 
+    ACE_NTOHL (0x653a312e), 
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Messaging/RoutingType:1.0
     12,
-    ACE_NTOHL (0x526f7574),
-    ACE_NTOHL (0x696e6754),
+    ACE_NTOHL (0x526f7574), 
+    ACE_NTOHL (0x696e6754), 
     ACE_NTOHL (0x79706500),  // name = RoutingType
     CORBA::tk_short,
 
@@ -3171,19 +3171,19 @@ static const CORBA::Long _oc_Messaging_RoutingTypeRange[] =
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     38,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x4d657373),
-    ACE_NTOHL (0x6167696e),
-    ACE_NTOHL (0x672f526f),
-    ACE_NTOHL (0x7574696e),
-    ACE_NTOHL (0x67547970),
-    ACE_NTOHL (0x653a312e),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x4d657373), 
+    ACE_NTOHL (0x6167696e), 
+    ACE_NTOHL (0x672f526f), 
+    ACE_NTOHL (0x7574696e), 
+    ACE_NTOHL (0x67547970), 
+    ACE_NTOHL (0x653a312e), 
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Messaging/RoutingType:1.0
     12,
-    ACE_NTOHL (0x526f7574),
-    ACE_NTOHL (0x696e6754),
+    ACE_NTOHL (0x526f7574), 
+    ACE_NTOHL (0x696e6754), 
     ACE_NTOHL (0x79706500),  // name = RoutingType
     CORBA::tk_short,
 
@@ -3333,7 +3333,7 @@ Messaging::RoutingPolicy_var::upcast (void *src)
   return *tmp;
 }
 // *************************************************************
-// Inline operations for class Messaging::RoutingPolicy_out
+// Operations for class Messaging::RoutingPolicy_out
 // *************************************************************
 
 Messaging::RoutingPolicy_out::RoutingPolicy_out (RoutingPolicy_ptr &p)
@@ -3461,7 +3461,7 @@ void *Messaging::RoutingPolicy::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-
+    
   if (retv)
     this->_add_ref ();
   return retv;
@@ -3604,7 +3604,7 @@ Messaging::MaxHopsPolicy_var::upcast (void *src)
   return *tmp;
 }
 // *************************************************************
-// Inline operations for class Messaging::MaxHopsPolicy_out
+// Operations for class Messaging::MaxHopsPolicy_out
 // *************************************************************
 
 Messaging::MaxHopsPolicy_out::MaxHopsPolicy_out (MaxHopsPolicy_ptr &p)
@@ -3732,7 +3732,7 @@ void *Messaging::MaxHopsPolicy::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-
+    
   if (retv)
     this->_add_ref ();
   return retv;
@@ -3875,7 +3875,7 @@ Messaging::QueueOrderPolicy_var::upcast (void *src)
   return *tmp;
 }
 // *************************************************************
-// Inline operations for class Messaging::QueueOrderPolicy_out
+// Operations for class Messaging::QueueOrderPolicy_out
 // *************************************************************
 
 Messaging::QueueOrderPolicy_out::QueueOrderPolicy_out (QueueOrderPolicy_ptr &p)
@@ -4003,7 +4003,7 @@ void *Messaging::QueueOrderPolicy::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-
+    
   if (retv)
     this->_add_ref ();
   return retv;
@@ -4020,46 +4020,46 @@ static const CORBA::Long _oc_Messaging_PolicyValue[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   38,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x4d657373),
-  ACE_NTOHL (0x6167696e),
-  ACE_NTOHL (0x672f506f),
-  ACE_NTOHL (0x6c696379),
-  ACE_NTOHL (0x56616c75),
-  ACE_NTOHL (0x653a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x4d657373), 
+  ACE_NTOHL (0x6167696e), 
+  ACE_NTOHL (0x672f506f), 
+  ACE_NTOHL (0x6c696379), 
+  ACE_NTOHL (0x56616c75), 
+  ACE_NTOHL (0x653a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Messaging/PolicyValue:1.0
   12,
-  ACE_NTOHL (0x506f6c69),
-  ACE_NTOHL (0x63795661),
+  ACE_NTOHL (0x506f6c69), 
+  ACE_NTOHL (0x63795661), 
   ACE_NTOHL (0x6c756500),  // name = PolicyValue
   2, // member count
   6,
-  ACE_NTOHL (0x70747970),
+  ACE_NTOHL (0x70747970), 
   ACE_NTOHL (0x65000000),  // name = ptype
   CORBA::tk_alias, // typecode kind for typedefs
   64, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     33,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f506f),
-    ACE_NTOHL (0x6c696379),
-    ACE_NTOHL (0x54797065),
-    ACE_NTOHL (0x3a312e30),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f506f), 
+    ACE_NTOHL (0x6c696379), 
+    ACE_NTOHL (0x54797065), 
+    ACE_NTOHL (0x3a312e30), 
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/PolicyType:1.0
     11,
-    ACE_NTOHL (0x506f6c69),
-    ACE_NTOHL (0x63795479),
+    ACE_NTOHL (0x506f6c69), 
+    ACE_NTOHL (0x63795479), 
     ACE_NTOHL (0x70650000),  // name = PolicyType
     CORBA::tk_ulong,
 
 
   7,
-  ACE_NTOHL (0x7076616c),
+  ACE_NTOHL (0x7076616c), 
   ACE_NTOHL (0x75650000),  // name = pvalue
   CORBA::tk_sequence, // typecode kind
   12, // encapsulation length
@@ -4100,30 +4100,30 @@ void Messaging::PolicyValue::_tao_any_destructor (void *x)
 Messaging::PolicyValue::_tao_seq_Octet::_tao_seq_Octet (void)
 {}
 Messaging::PolicyValue::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max) // uses max size
-  :
+  : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   TAO_Unbounded_Sequence<CORBA::Octet>
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<CORBA::Octet>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
 Messaging::PolicyValue::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max, CORBA::ULong length, CORBA::Octet *buffer, CORBA::Boolean release)
-  :
+  : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   TAO_Unbounded_Sequence<CORBA::Octet>
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<CORBA::Octet>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
 Messaging::PolicyValue::_tao_seq_Octet::_tao_seq_Octet (const _tao_seq_Octet &seq) // copy ctor
-  :
+  : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   TAO_Unbounded_Sequence<CORBA::Octet>
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<CORBA::Octet>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
 Messaging::PolicyValue::_tao_seq_Octet::~_tao_seq_Octet (void) // dtor
@@ -4139,7 +4139,7 @@ void Messaging::PolicyValue::_tao_seq_Octet::_tao_any_destructor (void *x)
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
+  
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_MESSAGING_POLICYVALUESEQ_CS_)
 #define __TAO_UNBOUNDED_SEQUENCE_MESSAGING_POLICYVALUESEQ_CS_
 
@@ -4148,43 +4148,43 @@ void Messaging::PolicyValue::_tao_seq_Octet::_tao_any_destructor (void *x)
   {
     Messaging::PolicyValue* tmp = 0;
     tmp = _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::allocbuf (length);
-
+    
     if (this->buffer_ != 0)
     {
       Messaging::PolicyValue *old = ACE_reinterpret_cast (Messaging::PolicyValue *,this->buffer_);
-
+      
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         tmp[i] = old[i];
-
+      
       if (this->release_)
         _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::freebuf (old);
-
+      
     }
     this->buffer_ = tmp;
   }
-
+  
   void
   Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::_deallocate_buffer (void)
   {
     if (this->buffer_ == 0 || this->release_ == 0)
       return;
-
+    
     Messaging::PolicyValue *tmp = ACE_reinterpret_cast (Messaging::PolicyValue *,this->buffer_);
-
+    
     _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::freebuf (tmp);
     this->buffer_ = 0;
-  }
-
+  } 
+  
   Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::~_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq (void) // Dtor.
   {
     this->_deallocate_buffer ();
   }
-
-
+  
+  
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_MESSAGING_POLICYVALUESEQ_CS_)
 #define _MESSAGING_POLICYVALUESEQ_CS_
@@ -4196,30 +4196,30 @@ void Messaging::PolicyValue::_tao_seq_Octet::_tao_any_destructor (void *x)
 Messaging::PolicyValueSeq::PolicyValueSeq (void)
 {}
 Messaging::PolicyValueSeq::PolicyValueSeq (CORBA::ULong max) // uses max size
-  :
+  : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<Messaging::PolicyValue>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
 Messaging::PolicyValueSeq::PolicyValueSeq (CORBA::ULong max, CORBA::ULong length, Messaging::PolicyValue *buffer, CORBA::Boolean release)
-  :
+  : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<Messaging::PolicyValue>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
 Messaging::PolicyValueSeq::PolicyValueSeq (const PolicyValueSeq &seq) // copy ctor
-  :
+  : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<Messaging::PolicyValue>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
 Messaging::PolicyValueSeq::~PolicyValueSeq (void) // dtor
@@ -4237,21 +4237,21 @@ static const CORBA::Long _oc_Messaging_PolicyValueSeq[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   41,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x4d657373),
-  ACE_NTOHL (0x6167696e),
-  ACE_NTOHL (0x672f506f),
-  ACE_NTOHL (0x6c696379),
-  ACE_NTOHL (0x56616c75),
-  ACE_NTOHL (0x65536571),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x4d657373), 
+  ACE_NTOHL (0x6167696e), 
+  ACE_NTOHL (0x672f506f), 
+  ACE_NTOHL (0x6c696379), 
+  ACE_NTOHL (0x56616c75), 
+  ACE_NTOHL (0x65536571), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/Messaging/PolicyValueSeq:1.0
   15,
-  ACE_NTOHL (0x506f6c69),
-  ACE_NTOHL (0x63795661),
-  ACE_NTOHL (0x6c756553),
+  ACE_NTOHL (0x506f6c69), 
+  ACE_NTOHL (0x63795661), 
+  ACE_NTOHL (0x6c756553), 
   ACE_NTOHL (0x65710000),  // name = PolicyValueSeq
   CORBA::tk_sequence, // typecode kind
   200, // encapsulation length
@@ -4260,46 +4260,46 @@ static const CORBA::Long _oc_Messaging_PolicyValueSeq[] =
     184, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       38,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x4d657373),
-      ACE_NTOHL (0x6167696e),
-      ACE_NTOHL (0x672f506f),
-      ACE_NTOHL (0x6c696379),
-      ACE_NTOHL (0x56616c75),
-      ACE_NTOHL (0x653a312e),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x4d657373), 
+      ACE_NTOHL (0x6167696e), 
+      ACE_NTOHL (0x672f506f), 
+      ACE_NTOHL (0x6c696379), 
+      ACE_NTOHL (0x56616c75), 
+      ACE_NTOHL (0x653a312e), 
       ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Messaging/PolicyValue:1.0
       12,
-      ACE_NTOHL (0x506f6c69),
-      ACE_NTOHL (0x63795661),
+      ACE_NTOHL (0x506f6c69), 
+      ACE_NTOHL (0x63795661), 
       ACE_NTOHL (0x6c756500),  // name = PolicyValue
       2, // member count
       6,
-      ACE_NTOHL (0x70747970),
+      ACE_NTOHL (0x70747970), 
       ACE_NTOHL (0x65000000),  // name = ptype
       CORBA::tk_alias, // typecode kind for typedefs
       64, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         33,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f506f),
-        ACE_NTOHL (0x6c696379),
-        ACE_NTOHL (0x54797065),
-        ACE_NTOHL (0x3a312e30),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f506f), 
+        ACE_NTOHL (0x6c696379), 
+        ACE_NTOHL (0x54797065), 
+        ACE_NTOHL (0x3a312e30), 
         ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/PolicyType:1.0
         11,
-        ACE_NTOHL (0x506f6c69),
-        ACE_NTOHL (0x63795479),
+        ACE_NTOHL (0x506f6c69), 
+        ACE_NTOHL (0x63795479), 
         ACE_NTOHL (0x70650000),  // name = PolicyType
         CORBA::tk_ulong,
 
 
       7,
-      ACE_NTOHL (0x7076616c),
+      ACE_NTOHL (0x7076616c), 
       ACE_NTOHL (0x75650000),  // name = pvalue
       CORBA::tk_sequence, // typecode kind
       12, // encapsulation length
@@ -4401,7 +4401,7 @@ Messaging::ExceptionHolder_init::~ExceptionHolder_init (void)
 {
 }
 
-const char*
+const char* 
 Messaging::ExceptionHolder_init::tao_repository_id (void)
 {
   return ExceptionHolder::_tao_obv_static_repository_id ();
@@ -4534,7 +4534,7 @@ Messaging::ReplyHandler_var::upcast (void *src)
   return *tmp;
 }
 // *************************************************************
-// Inline operations for class Messaging::ReplyHandler_out
+// Operations for class Messaging::ReplyHandler_out
 // *************************************************************
 
 Messaging::ReplyHandler_out::ReplyHandler_out (ReplyHandler_ptr &p)
@@ -4597,7 +4597,7 @@ Messaging::ReplyHandler_out::operator-> (void)
 #endif /* TAO_HAS_INTERCEPTORS */
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation.
+//                Base & Remote Proxy  Implementation. 
 //
 
 Messaging::_TAO_ReplyHandler_Proxy_Impl::_TAO_ReplyHandler_Proxy_Impl (void)
@@ -4610,7 +4610,7 @@ Messaging::_TAO_ReplyHandler_Remote_Proxy_Impl::_TAO_ReplyHandler_Remote_Proxy_I
 
 
 //
-//            End  Base & Remote  Proxy Implemeentation.
+//            End  Base & Remote  Proxy Implemeentation. 
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -4782,7 +4782,7 @@ void *Messaging::ReplyHandler::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-
+    
   if (retv)
     this->_add_ref ();
   return retv;
@@ -5485,18 +5485,23 @@ CORBA::Boolean operator>> (
     // retrieve all the elements
     
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
-    if (ACE_BIT_DISABLED (strm.start ()->flags (),ACE_Message_Block::DONT_DELETE))
+    if (ACE_BIT_DISABLED (strm.start ()->flags (),
+    ACE_Message_Block::DONT_DELETE))
     {
-      TAO_Unbounded_Sequence<CORBA::Octet> *oseq = 
-        ACE_static_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence);
-      oseq->replace (_tao_seq_len, strm.start ());
-      oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len);
-      strm.skip_bytes (_tao_seq_len);
-      return 1;
+      TAO_ORB_Core* orb_core = strm.orb_core ();
+      if (orb_core != 0 &&
+      strm.orb_core ()->resource_factory ()->
+      input_cdr_allocator_type_locked () == 1)
+      {
+        TAO_Unbounded_Sequence<CORBA::Octet> *oseq = 
+          ACE_static_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence);
+        oseq->replace (_tao_seq_len, strm.start ());
+        oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len);
+        strm.skip_bytes (_tao_seq_len);
+        return 1;
+      }
     }
-    else
-      return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len);
-    
+    return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len);
 #else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
     return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
   
@@ -5536,7 +5541,7 @@ CORBA::Boolean operator>> (
     // set the length of the sequence
     _tao_sequence.length (_tao_seq_len);
     // If length is 0 we return true.
-    if (0 >= _tao_seq_len)
+    if (0 >= _tao_seq_len) 
       return 1;
     // retrieve all the elements
     CORBA::Boolean _tao_marshal_flag = 1;
diff --git a/TAO/tao/PortableServer/PortableServerC.cpp b/TAO/tao/PortableServer/PortableServerC.cpp
index 05af00d7e5c..a9d8993bf6f 100644
--- a/TAO/tao/PortableServer/PortableServerC.cpp
+++ b/TAO/tao/PortableServer/PortableServerC.cpp
@@ -623,7 +623,7 @@ PortableServer::ThreadPolicy_var::upcast (void *src)
 }
 
 // *************************************************************
-// Inline operations for class PortableServer::ThreadPolicy_out
+// Operations for class PortableServer::ThreadPolicy_out
 // *************************************************************
 
 PortableServer::ThreadPolicy_out::ThreadPolicy_out (ThreadPolicy_ptr &p)
@@ -933,7 +933,7 @@ PortableServer::LifespanPolicy_var::upcast (void *src)
 }
 
 // *************************************************************
-// Inline operations for class PortableServer::LifespanPolicy_out
+// Operations for class PortableServer::LifespanPolicy_out
 // *************************************************************
 
 PortableServer::LifespanPolicy_out::LifespanPolicy_out (LifespanPolicy_ptr &p)
@@ -1243,7 +1243,7 @@ PortableServer::IdUniquenessPolicy_var::upcast (void *src)
 }
 
 // *************************************************************
-// Inline operations for class PortableServer::IdUniquenessPolicy_out
+// Operations for class PortableServer::IdUniquenessPolicy_out
 // *************************************************************
 
 PortableServer::IdUniquenessPolicy_out::IdUniquenessPolicy_out (IdUniquenessPolicy_ptr &p)
@@ -1552,7 +1552,7 @@ PortableServer::IdAssignmentPolicy_var::upcast (void *src)
 }
 
 // *************************************************************
-// Inline operations for class PortableServer::IdAssignmentPolicy_out
+// Operations for class PortableServer::IdAssignmentPolicy_out
 // *************************************************************
 
 PortableServer::IdAssignmentPolicy_out::IdAssignmentPolicy_out (IdAssignmentPolicy_ptr &p)
@@ -1873,7 +1873,7 @@ PortableServer::ImplicitActivationPolicy_var::upcast (void *src)
 }
 
 // *************************************************************
-// Inline operations for class PortableServer::ImplicitActivationPolicy_out
+// Operations for class PortableServer::ImplicitActivationPolicy_out
 // *************************************************************
 
 PortableServer::ImplicitActivationPolicy_out::ImplicitActivationPolicy_out (ImplicitActivationPolicy_ptr &p)
@@ -2184,7 +2184,7 @@ PortableServer::ServantRetentionPolicy_var::upcast (void *src)
 }
 
 // *************************************************************
-// Inline operations for class PortableServer::ServantRetentionPolicy_out
+// Operations for class PortableServer::ServantRetentionPolicy_out
 // *************************************************************
 
 PortableServer::ServantRetentionPolicy_out::ServantRetentionPolicy_out (ServantRetentionPolicy_ptr &p)
@@ -2509,7 +2509,7 @@ PortableServer::RequestProcessingPolicy_var::upcast (void *src)
 }
 
 // *************************************************************
-// Inline operations for class PortableServer::RequestProcessingPolicy_out
+// Operations for class PortableServer::RequestProcessingPolicy_out
 // *************************************************************
 
 PortableServer::RequestProcessingPolicy_out::RequestProcessingPolicy_out (RequestProcessingPolicy_ptr &p)
@@ -2774,7 +2774,7 @@ PortableServer::POAManager_var::upcast (void *src)
 }
 
 // *************************************************************
-// Inline operations for class PortableServer::POAManager_out
+// Operations for class PortableServer::POAManager_out
 // *************************************************************
 
 PortableServer::POAManager_out::POAManager_out (POAManager_ptr &p)
@@ -3095,7 +3095,7 @@ PortableServer::AdapterActivator_var::upcast (void *src)
 }
 
 // *************************************************************
-// Inline operations for class PortableServer::AdapterActivator_out
+// Operations for class PortableServer::AdapterActivator_out
 // *************************************************************
 
 PortableServer::AdapterActivator_out::AdapterActivator_out (AdapterActivator_ptr &p)
@@ -3346,7 +3346,7 @@ PortableServer::ServantManager_var::upcast (void *src)
 }
 
 // *************************************************************
-// Inline operations for class PortableServer::ServantManager_out
+// Operations for class PortableServer::ServantManager_out
 // *************************************************************
 
 PortableServer::ServantManager_out::ServantManager_out (ServantManager_ptr &p)
@@ -3597,7 +3597,7 @@ PortableServer::ServantActivator_var::upcast (void *src)
 }
 
 // *************************************************************
-// Inline operations for class PortableServer::ServantActivator_out
+// Operations for class PortableServer::ServantActivator_out
 // *************************************************************
 
 PortableServer::ServantActivator_out::ServantActivator_out (ServantActivator_ptr &p)
@@ -3860,7 +3860,7 @@ PortableServer::ServantLocator_var::upcast (void *src)
 }
 
 // *************************************************************
-// Inline operations for class PortableServer::ServantLocator_out
+// Operations for class PortableServer::ServantLocator_out
 // *************************************************************
 
 PortableServer::ServantLocator_out::ServantLocator_out (ServantLocator_ptr &p)
@@ -4125,7 +4125,7 @@ PortableServer::POA_var::upcast (void *src)
 }
 
 // *************************************************************
-// Inline operations for class PortableServer::POA_out
+// Operations for class PortableServer::POA_out
 // *************************************************************
 
 PortableServer::POA_out::POA_out (POA_ptr &p)
@@ -5070,7 +5070,7 @@ PortableServer::Current_var::upcast (void *src)
 }
 
 // *************************************************************
-// Inline operations for class PortableServer::Current_out
+// Operations for class PortableServer::Current_out
 // *************************************************************
 
 PortableServer::Current_out::Current_out (Current_ptr &p)
@@ -5919,18 +5919,23 @@ CORBA::Boolean operator>> (
     // retrieve all the elements
     
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
-    if (ACE_BIT_DISABLED (strm.start ()->flags (),ACE_Message_Block::DONT_DELETE))
+    if (ACE_BIT_DISABLED (strm.start ()->flags (),
+    ACE_Message_Block::DONT_DELETE))
     {
-      TAO_Unbounded_Sequence<CORBA::Octet> *oseq = 
-        ACE_static_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence);
-      oseq->replace (_tao_seq_len, strm.start ());
-      oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len);
-      strm.skip_bytes (_tao_seq_len);
-      return 1;
+      TAO_ORB_Core* orb_core = strm.orb_core ();
+      if (orb_core != 0 &&
+      strm.orb_core ()->resource_factory ()->
+      input_cdr_allocator_type_locked () == 1)
+      {
+        TAO_Unbounded_Sequence<CORBA::Octet> *oseq = 
+          ACE_static_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence);
+        oseq->replace (_tao_seq_len, strm.start ());
+        oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len);
+        strm.skip_bytes (_tao_seq_len);
+        return 1;
+      }
     }
-    else
-      return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len);
-    
+    return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len);
 #else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
     return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
   
diff --git a/TAO/tao/Services.cpp b/TAO/tao/Services.cpp
index 71903f763d0..4b5e1019c78 100644
--- a/TAO/tao/Services.cpp
+++ b/TAO/tao/Services.cpp
@@ -13,6 +13,7 @@
 #include "tao/Any.h"
 #include "tao/Environment.h"
 #include "tao/Typecode.h"
+#include "tao/ORB_Core.h"
 
 #if !defined (__ACE_INLINE__)
 #include "Services.i"
@@ -427,17 +428,25 @@ CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA_ServiceDetail::_tao_seq_Oct
     // retrieve all the elements
 
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
-    if (ACE_BIT_DISABLED (strm.start ()->flags (),ACE_Message_Block::DONT_DELETE))
-    {
-      TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
-        ACE_dynamic_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence);
-      oseq->replace (_tao_seq_len, strm.start ());
-      oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len);
-      strm.skip_bytes (_tao_seq_len);
-      return 1;
-    }
-    else
-      return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len);
+    if (ACE_BIT_DISABLED (strm.start ()->flags (),
+                          ACE_Message_Block::DONT_DELETE))
+      {
+        TAO_ORB_Core* orb_core = strm.orb_core ();
+
+        if (orb_core != 0 &&
+            strm.orb_core ()->resource_factory ()->
+            input_cdr_allocator_type_locked () == 1)
+          {
+            TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
+              ACE_static_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence);
+            oseq->replace (_tao_seq_len, strm.start ());
+            oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len);
+            strm.skip_bytes (_tao_seq_len);
+            return 1;
+          }
+      }
+
+    return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len);
 
 #else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
     return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
diff --git a/TAO/tao/diffs/IOPC.cpp.diff b/TAO/tao/diffs/IOPC.cpp.diff
index 70288084079..bb8f1504dbc 100644
--- a/TAO/tao/diffs/IOPC.cpp.diff
+++ b/TAO/tao/diffs/IOPC.cpp.diff
@@ -1,13 +1,5 @@
---- orig/IOPC.cpp	Tue Apr 24 23:48:58 2001
-+++ IOPC.cpp	Tue Apr 24 13:44:40 2001
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
+--- IOPC.cpp	Thu May  3 11:29:04 2001
++++ IOPC.cpp.mod	Thu May  3 00:08:59 2001
 @@ -21,13 +21,6 @@
  
  #include "IOPC.h"
@@ -22,16 +14,17 @@
  #if defined (__BORLANDC__)
  #pragma option -w-rvl -w-rch -w-ccc -w-aus
  #endif /* __BORLANDC__ */
-@@ -36,6 +29,8 @@
+@@ -36,6 +29,9 @@
  #include "IOPC.i"
  #endif /* !defined INLINE */
  
 +#include "Typecode.h"
++#include "ORB_Core.h"
 +
  static const CORBA::Long _oc_IOP_ProfileId[] =
  {
    TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -1571,49 +1566,6 @@
+@@ -1571,49 +1567,6 @@
  TAO_NAMESPACE_BEGIN (IOP)
  TAO_NAMESPACE_DEFINE (const CORBA::ULong, FT_REQUEST, 13U)
  TAO_NAMESPACE_END
@@ -81,7 +74,7 @@
  // *************************************************************
  // Operations for class IOP::Codec_var
  // *************************************************************
-@@ -2184,49 +2136,6 @@
+@@ -2184,49 +2137,6 @@
    delete tmp;
  }
  
@@ -131,7 +124,7 @@
  // *************************************************************
  // Operations for class IOP::CodecFactory_var
  // *************************************************************
-@@ -3383,11 +3292,6 @@
+@@ -3383,11 +3293,6 @@
      // If length is 0 we return true.
      if (0 >= _tao_seq_len) 
        return 1;
@@ -143,7 +136,7 @@
      // retrieve all the elements
      
  #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
-@@ -3448,11 +3352,6 @@
+@@ -3453,11 +3358,6 @@
      // If length is 0 we return true.
      if (0 >= _tao_seq_len) 
        return 1;
@@ -155,7 +148,7 @@
      // retrieve all the elements
      CORBA::Boolean _tao_marshal_flag = 1;
      for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-@@ -3510,11 +3409,6 @@
+@@ -3515,11 +3415,6 @@
      // If length is 0 we return true.
      if (0 >= _tao_seq_len) 
        return 1;
@@ -167,7 +160,7 @@
      // retrieve all the elements
      
  #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
-@@ -3571,11 +3465,6 @@
+@@ -3581,11 +3476,6 @@
      // If length is 0 we return true.
      if (0 >= _tao_seq_len) 
        return 1;
@@ -179,7 +172,7 @@
      // retrieve all the elements
      CORBA::Boolean _tao_marshal_flag = 1;
      for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-@@ -3618,11 +3507,6 @@
+@@ -3628,11 +3518,6 @@
      // If length is 0 we return true.
      if (0 >= _tao_seq_len) 
        return 1;
@@ -191,7 +184,7 @@
      // retrieve all the elements
      CORBA::Boolean _tao_marshal_flag = 1;
      for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-@@ -3665,11 +3549,6 @@
+@@ -3675,11 +3560,6 @@
      // If length is 0 we return true.
      if (0 >= _tao_seq_len) 
        return 1;
@@ -203,7 +196,7 @@
      // retrieve all the elements
      CORBA::Boolean _tao_marshal_flag = 1;
      for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-@@ -3725,11 +3604,6 @@
+@@ -3735,11 +3615,6 @@
      // If length is 0 we return true.
      if (0 >= _tao_seq_len) 
        return 1;
@@ -215,7 +208,7 @@
      // retrieve all the elements
      
  #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
-@@ -3786,11 +3660,6 @@
+@@ -3801,11 +3676,6 @@
      // If length is 0 we return true.
      if (0 >= _tao_seq_len) 
        return 1;
@@ -227,3 +220,8 @@
      // retrieve all the elements
      CORBA::Boolean _tao_marshal_flag = 1;
      for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
+@@ -3816,4 +3686,3 @@
+   }
+   return 0; // error
+ }
+-
diff --git a/TAO/tao/diffs/MessagingC.cpp.diff b/TAO/tao/diffs/MessagingC.cpp.diff
index 9d8798ac7f4..b8c4f4701fc 100644
--- a/TAO/tao/diffs/MessagingC.cpp.diff
+++ b/TAO/tao/diffs/MessagingC.cpp.diff
@@ -1,13 +1,5 @@
---- orig/MessagingC.cpp	Wed Apr 25 00:17:25 2001
-+++ MessagingC.cpp	Thu Apr 26 14:33:42 2001
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
+--- MessagingC.cpp	Thu May  3 11:29:04 2001
++++ MessagingC.cpp.mod	Wed May  2 19:11:24 2001
 @@ -21,6 +21,8 @@
  
  #include "MessagingC.h"
@@ -79,7 +71,7 @@
  }
 -
  // *************************************************************
- // Inline operations for class Messaging::RebindPolicy_out
+ // Operations for class Messaging::RebindPolicy_out
  // *************************************************************
 @@ -631,52 +593,12 @@
    return "IDL:omg.org/Messaging/RebindPolicy:1.0";
@@ -151,7 +143,7 @@
  }
 -
  // *************************************************************
- // Inline operations for class Messaging::SyncScopePolicy_out
+ // Operations for class Messaging::SyncScopePolicy_out
  // *************************************************************
 @@ -860,7 +783,6 @@
    return this->ptr_;
@@ -227,7 +219,7 @@
  }
 -
  // *************************************************************
- // Inline operations for class Messaging::RequestPriorityPolicy_out
+ // Operations for class Messaging::RequestPriorityPolicy_out
  // *************************************************************
 @@ -1340,48 +1223,6 @@
  TAO_NAMESPACE_BEGIN (Messaging)
@@ -284,7 +276,7 @@
  }
 -
  // *************************************************************
- // Inline operations for class Messaging::ReplyPriorityPolicy_out
+ // Operations for class Messaging::ReplyPriorityPolicy_out
  // *************************************************************
 @@ -1646,52 +1486,14 @@
    return "IDL:omg.org/Messaging/ReplyPriorityPolicy:1.0";
@@ -349,7 +341,7 @@
  }
 -
  // *************************************************************
- // Inline operations for class Messaging::RequestStartTimePolicy_out
+ // Operations for class Messaging::RequestStartTimePolicy_out
  // *************************************************************
 @@ -1956,52 +1757,14 @@
    return "IDL:omg.org/Messaging/RequestStartTimePolicy:1.0";
@@ -414,7 +406,7 @@
  }
 -
  // *************************************************************
- // Inline operations for class Messaging::RequestEndTimePolicy_out
+ // Operations for class Messaging::RequestEndTimePolicy_out
  // *************************************************************
 @@ -2266,52 +2028,14 @@
    return "IDL:omg.org/Messaging/RequestEndTimePolicy:1.0";
@@ -479,7 +471,7 @@
  }
 -
  // *************************************************************
- // Inline operations for class Messaging::ReplyStartTimePolicy_out
+ // Operations for class Messaging::ReplyStartTimePolicy_out
  // *************************************************************
 @@ -2576,52 +2299,14 @@
    return "IDL:omg.org/Messaging/ReplyStartTimePolicy:1.0";
@@ -544,7 +536,7 @@
  }
 -
  // *************************************************************
- // Inline operations for class Messaging::ReplyEndTimePolicy_out
+ // Operations for class Messaging::ReplyEndTimePolicy_out
  // *************************************************************
 @@ -2886,52 +2570,14 @@
    return "IDL:omg.org/Messaging/ReplyEndTimePolicy:1.0";
@@ -609,7 +601,7 @@
  }
 -
  // *************************************************************
- // Inline operations for class Messaging::RelativeRequestTimeoutPolicy_out
+ // Operations for class Messaging::RelativeRequestTimeoutPolicy_out
  // *************************************************************
 @@ -3196,52 +2841,14 @@
    return "IDL:omg.org/Messaging/RelativeRequestTimeoutPolicy:1.0";
@@ -674,7 +666,7 @@
  }
 -
  // *************************************************************
- // Inline operations for class Messaging::RelativeRoundtripTimeoutPolicy_out
+ // Operations for class Messaging::RelativeRoundtripTimeoutPolicy_out
  // *************************************************************
 @@ -3506,6 +3112,10 @@
    return "IDL:omg.org/Messaging/RelativeRoundtripTimeoutPolicy:1.0";
@@ -742,7 +734,7 @@
  }
 -
  // *************************************************************
- // Inline operations for class Messaging::RoutingPolicy_out
+ // Operations for class Messaging::RoutingPolicy_out
  // *************************************************************
 @@ -3905,52 +3472,14 @@
    return "IDL:omg.org/Messaging/RoutingPolicy:1.0";
@@ -807,7 +799,7 @@
  }
 -
  // *************************************************************
- // Inline operations for class Messaging::MaxHopsPolicy_out
+ // Operations for class Messaging::MaxHopsPolicy_out
  // *************************************************************
 @@ -4215,52 +3743,14 @@
    return "IDL:omg.org/Messaging/MaxHopsPolicy:1.0";
@@ -872,7 +864,7 @@
  }
 -
  // *************************************************************
- // Inline operations for class Messaging::QueueOrderPolicy_out
+ // Operations for class Messaging::QueueOrderPolicy_out
  // *************************************************************
 @@ -4525,6 +4014,8 @@
    return "IDL:omg.org/Messaging/QueueOrderPolicy:1.0";
@@ -948,7 +940,7 @@
  }
 -
  // *************************************************************
- // Inline operations for class Messaging::ReplyHandler_out
+ // Operations for class Messaging::ReplyHandler_out
  // *************************************************************
 @@ -5376,6 +4827,11 @@
  TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ReplyHandler, &_tc_TAO_tc_Messaging_ReplyHandler)
@@ -1003,7 +995,7 @@
      // retrieve all the elements
      
  #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
-@@ -6079,11 +5538,6 @@
+@@ -6084,11 +5543,6 @@
      // If length is 0 we return true.
      if (0 >= _tao_seq_len) 
        return 1;
@@ -1015,7 +1007,7 @@
      // retrieve all the elements
      CORBA::Boolean _tao_marshal_flag = 1;
      for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-@@ -6095,6 +5549,8 @@
+@@ -6100,6 +5554,8 @@
    return 0; // error
  }
  
@@ -1024,7 +1016,7 @@
  CORBA::Boolean operator<< (
      TAO_OutputCDR &strm,
      const Messaging::ReplyHandler_ptr _tao_objref
-@@ -6131,3 +5587,6 @@
+@@ -6136,3 +5592,6 @@
    return 0;
  }
  
diff --git a/TAO/tao/diffs/OctetSeqC.cpp.diff b/TAO/tao/diffs/OctetSeqC.cpp.diff
new file mode 100644
index 00000000000..76d270ac9ca
--- /dev/null
+++ b/TAO/tao/diffs/OctetSeqC.cpp.diff
@@ -0,0 +1,264 @@
+--- OctetSeqC.cpp	Thu May  3 11:29:05 2001
++++ OctetSeqC.cpp.mod	Wed May  2 23:32:41 2001
+@@ -1,6 +1,6 @@
+ // -*- C++ -*-
+ //
+-// $Id$
++// $Id$
+ 
+ // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+ // TAO and the TAO IDL Compiler have been developed by:
+@@ -21,13 +21,6 @@
+ 
+ #include "OctetSeqC.h"
+ 
+-#include "tao/Stub.h"
+-#include "tao/Invocation.h"
+-#include "tao/ClientRequestInfo.h"
+-#if TAO_HAS_INTERCEPTORS == 1
+-#include "tao/RequestInfo_Util.h"
+-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+-
+ #if defined (__BORLANDC__)
+ #pragma option -w-rvl -w-rch -w-ccc -w-aus
+ #endif /* __BORLANDC__ */
+@@ -36,6 +29,10 @@
+ #include "OctetSeqC.i"
+ #endif /* !defined INLINE */
+ 
++#include "Any.h"
++#include "CDR.h"
++#include "Typecode.h"
++#include "ORB_Core.h"
+ 
+ #if !defined (_CORBA_OCTETSEQ_CS_)
+ #define _CORBA_OCTETSEQ_CS_
+@@ -44,9 +41,9 @@
+ // CORBA::OctetSeq
+ // *************************************************************
+ 
+-CORBA::OctetSeq::OctetSeq (void)
++CORBA_OctetSeq::CORBA_OctetSeq (void)
+ {}
+-CORBA::OctetSeq::OctetSeq (CORBA::ULong max) // uses max size
++CORBA_OctetSeq::CORBA_OctetSeq (CORBA::ULong max) // uses max size
+   : 
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+   TAO_Unbounded_Sequence<CORBA::Octet>
+@@ -55,7 +52,7 @@
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+  (max)
+ {}
+-CORBA::OctetSeq::OctetSeq (CORBA::ULong max, CORBA::ULong length, CORBA::Octet *buffer, CORBA::Boolean release)
++CORBA_OctetSeq::CORBA_OctetSeq (CORBA::ULong max, CORBA::ULong length, CORBA::Octet *buffer, CORBA::Boolean release)
+   : 
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+   TAO_Unbounded_Sequence<CORBA::Octet>
+@@ -64,7 +61,7 @@
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+  (max, length, buffer, release)
+ {}
+-CORBA::OctetSeq::OctetSeq (const OctetSeq &seq) // copy ctor
++CORBA_OctetSeq::CORBA_OctetSeq (const CORBA_OctetSeq &seq) // copy ctor
+   : 
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+   TAO_Unbounded_Sequence<CORBA::Octet>
+@@ -73,11 +70,11 @@
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+  (seq)
+ {}
+-CORBA::OctetSeq::~OctetSeq (void) // dtor
++CORBA_OctetSeq::~CORBA_OctetSeq (void) // dtor
+ {}
+-void CORBA::OctetSeq::_tao_any_destructor (void *x)
++void CORBA_OctetSeq::_tao_any_destructor (void *x)
+ {
+-  OctetSeq *tmp = ACE_static_cast (OctetSeq*,x);
++  CORBA_OctetSeq *tmp = ACE_static_cast (CORBA_OctetSeq*,x);
+   delete tmp;
+ }
+ 
+@@ -87,19 +84,8 @@
+ static const CORBA::Long _oc_CORBA_OctetSeq[] =
+ {
+   TAO_ENCAP_BYTE_ORDER, // byte order
+-  31,
+-  ACE_NTOHL (0x49444c3a), 
+-  ACE_NTOHL (0x6f6d672e), 
+-  ACE_NTOHL (0x6f72672f), 
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x412f4f63), 
+-  ACE_NTOHL (0x74657453), 
+-  ACE_NTOHL (0x65713a31), 
+-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0
+-  9,
+-  ACE_NTOHL (0x4f637465), 
+-  ACE_NTOHL (0x74536571), 
+-  ACE_NTOHL (0x0),  // name = OctetSeq
++  31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4f63), ACE_NTOHL (0x74657453), ACE_NTOHL (0x65713a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0
++  9, ACE_NTOHL (0x4f637465), ACE_NTOHL (0x74536571), ACE_NTOHL (0x0),  // name = OctetSeq
+   CORBA::tk_sequence, // typecode kind
+   12, // encapsulation length
+     TAO_ENCAP_BYTE_ORDER, // byte order
+@@ -108,15 +94,7 @@
+     0U,
+ 
+ };
+-
+-static CORBA::TypeCode _tc_TAO_tc_CORBA_OctetSeq (
+-    CORBA::tk_alias,
+-    sizeof (_oc_CORBA_OctetSeq),
+-    (char *) &_oc_CORBA_OctetSeq,
+-    0,
+-    sizeof (CORBA::OctetSeq)
+-  );
+-
++static CORBA::TypeCode _tc_TAO_tc_CORBA_OctetSeq (CORBA::tk_alias, sizeof (_oc_CORBA_OctetSeq), (char *) &_oc_CORBA_OctetSeq, 0, sizeof (CORBA_OctetSeq));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (CORBA)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_OctetSeq, &_tc_TAO_tc_CORBA_OctetSeq)
+@@ -124,7 +102,7 @@
+ 
+ void operator<<= (
+     CORBA::Any &_tao_any,
+-    const CORBA::OctetSeq &_tao_elem
++    const CORBA_OctetSeq &_tao_elem
+   ) // copying
+ {
+   TAO_OutputCDR stream;
+@@ -138,7 +116,7 @@
+   }
+ }
+ 
+-void operator<<= (CORBA::Any &_tao_any, CORBA::OctetSeq *_tao_elem) // non copying
++void operator<<= (CORBA::Any &_tao_any, CORBA_OctetSeq *_tao_elem) // non copying
+ {
+   TAO_OutputCDR stream;
+   stream << *_tao_elem;
+@@ -148,43 +126,45 @@
+       stream.begin (),
+       1,
+       _tao_elem,
+-      CORBA::OctetSeq::_tao_any_destructor
++      CORBA_OctetSeq::_tao_any_destructor
+     );
+ }
+ 
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::OctetSeq *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_OctetSeq *&_tao_elem)
+ {
+   return _tao_any >>= ACE_const_cast(
+-      const CORBA::OctetSeq*&,
++      const CORBA_OctetSeq*&,
+       _tao_elem
+     );
+ }
+ 
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::OctetSeq *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_OctetSeq *&_tao_elem)
+ {
+   _tao_elem = 0;
+   ACE_TRY_NEW_ENV
+   {
+     CORBA::TypeCode_var type = _tao_any.type ();
+-    
+-    CORBA::Boolean result = type->equivalent (CORBA::_tc_OctetSeq, ACE_TRY_ENV);
++    CORBA::Boolean result =
++      type->equivalent (CORBA::_tc_OctetSeq, ACE_TRY_ENV);
+     ACE_TRY_CHECK;
+     
+     if (!result)
+-      return 0; // not equivalent
++      {
++        return 0;
++      }
+     
+     if (_tao_any.any_owns_data ())
+     {
+       _tao_elem = ACE_static_cast(
+-          const CORBA::OctetSeq*,
++          const CORBA_OctetSeq*,
+           _tao_any.value ()
+         );
+       return 1;
+     }
+     else
+     {
+-      CORBA::OctetSeq *tmp;
+-      ACE_NEW_RETURN (tmp, CORBA::OctetSeq, 0);
++      CORBA_OctetSeq *tmp;
++      ACE_NEW_RETURN (tmp, CORBA_OctetSeq, 0);
+       TAO_InputCDR stream (
+           _tao_any._tao_get_cdr (),
+           _tao_any._tao_byte_order ()
+@@ -195,7 +175,7 @@
+             CORBA::_tc_OctetSeq,
+             1,
+             ACE_static_cast (void *, tmp),
+-            CORBA::OctetSeq::_tao_any_destructor
++            CORBA_OctetSeq::_tao_any_destructor
+           );
+         _tao_elem = tmp;
+         return 1;
+@@ -215,7 +195,7 @@
+ 
+ CORBA::Boolean operator<< (
+     TAO_OutputCDR &strm,
+-    const CORBA::OctetSeq &_tao_sequence
++    const CORBA_OctetSeq &_tao_sequence
+   )
+ {
+   if (strm << _tao_sequence.length ())
+@@ -225,7 +205,7 @@
+ #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
+     {
+       TAO_Unbounded_Sequence<CORBA::Octet> *oseq = 
+-        ACE_static_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (CORBA::OctetSeq *)&_tao_sequence);
++        ACE_static_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (CORBA_OctetSeq *)&_tao_sequence);
+       if (oseq->mb ())
+         return strm.write_octet_array_mb (oseq->mb ());
+       else
+@@ -242,7 +222,7 @@
+ 
+ CORBA::Boolean operator>> (
+     TAO_InputCDR &strm,
+-    CORBA::OctetSeq &_tao_sequence
++    CORBA_OctetSeq &_tao_sequence
+   )
+ {
+   CORBA::ULong _tao_seq_len;
+@@ -253,11 +233,6 @@
+     // If length is 0 we return true.
+     if (0 >= _tao_seq_len) 
+       return 1;
+-    // Add a check to the length of the sequence
+-    // to make sure it does not exceed the length
+-    // of the stream. (See bug 58.)
+-    if (_tao_seq_len > strm.length())
+-      return 0;
+     // retrieve all the elements
+     
+ #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
+@@ -265,6 +240,7 @@
+     ACE_Message_Block::DONT_DELETE))
+     {
+       TAO_ORB_Core* orb_core = strm.orb_core ();
++
+       if (orb_core != 0 &&
+       strm.orb_core ()->resource_factory ()->
+       input_cdr_allocator_type_locked () == 1)
+@@ -277,7 +253,9 @@
+         return 1;
+       }
+     }
++
+     return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len);
++
+ #else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
+     return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
+   
+@@ -285,4 +263,3 @@
+   }
+   return 0; // error
+ }
+-
diff --git a/TAO/tao/diffs/PortableServerC.cpp.diff b/TAO/tao/diffs/PortableServerC.cpp.diff
index 50782ad0c35..beeec32e0a8 100644
--- a/TAO/tao/diffs/PortableServerC.cpp.diff
+++ b/TAO/tao/diffs/PortableServerC.cpp.diff
@@ -1,13 +1,5 @@
---- PortableServer/orig/PortableServerC.cpp	Wed Apr 25 00:19:16 2001
-+++ PortableServer/PortableServerC.cpp	Tue Apr 24 13:44:54 2001
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
+--- PortableServerC.cpp	Thu May  3 11:29:20 2001
++++ PortableServerC.cpp.mod	Wed May  2 19:11:25 2001
 @@ -20,13 +20,8 @@
  //     http://www.cs.wustl.edu/~schmidt/TAO.html
author	pradeep <pradeep@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>	2001-05-03 17:13:21 +0000
committer	pradeep <pradeep@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>	2001-05-03 17:13:21 +0000
commit	4617dba8623e30d0bde198fa6243f995adc948a6 (patch)
tree	c117412f26e505aa03681175feabead8308132a7
parent	cd6754040daa726a31ee13423e60aaaf14d35294 (diff)
download	ATCD-4617dba8623e30d0bde198fa6243f995adc948a6.tar.gz