1 files changed, 33 insertions, 24 deletions
diff --git a/TAO/tao/GIOP_Message_Lite.cpp b/TAO/tao/GIOP_Message_Lite.cpp
index 3ff0683729a..462266dd9bf 100644
--- a/TAO/tao/GIOP_Message_Lite.cpp
+++ b/TAO/tao/GIOP_Message_Lite.cpp
@@ -243,7 +243,6 @@ TAO_GIOP_Message_Lite::format_message (TAO_OutputCDR &stream)
 }
 
 
-#if 0
 int
 TAO_GIOP_Message_Lite::parse_incoming_messages (ACE_Message_Block &block)
 {
@@ -502,7 +501,6 @@ TAO_GIOP_Message_Lite::consolidate_fragments (TAO_Queued_Data * /*dqd*/,
   // We dont know what fragments are???
   return -1;
 }
-#endif
 
 int
 TAO_GIOP_Message_Lite::process_request_message (TAO_Transport *transport,
@@ -730,9 +728,7 @@ TAO_GIOP_Message_Lite::process_request (TAO_Transport *transport,
       parse_error =
         this->parse_request_header (request);
 
-      TAO_Codeset_Manager *csm = request.orb_core()->codeset_manager();
-      if (csm)
-        csm->process_service_context(request);
+      request.orb_core()->codeset_manager()->process_service_context(request);
       transport->assign_translators(&cdr,&output);
 
       // Throw an exception if the
@@ -1630,6 +1626,38 @@ TAO_GIOP_Message_Lite::dump_msg (const char *label,
     }
 }
 
+TAO_Queued_Data *
+TAO_GIOP_Message_Lite::make_queued_data (size_t sz)
+{
+  // Get a node for the queue..
+  TAO_Queued_Data *qd =
+    TAO_Queued_Data::get_queued_data ();
+
+  // Make a datablock for the size requested + something. The
+  // "something" is required because we are going to align the data
+  // block in the message block. During alignment we could loose some
+  // bytes. As we may not know how many bytes will be lost, we will
+  // allocate ACE_CDR::MAX_ALIGNMENT extra.
+  ACE_Data_Block *db =
+    this->orb_core_->create_input_cdr_data_block (sz +
+                                                  ACE_CDR::MAX_ALIGNMENT);
+
+  ACE_Allocator *alloc =
+    this->orb_core_->input_cdr_msgblock_allocator ();
+
+  ACE_Message_Block mb (db,
+                        0,
+                        alloc);
+
+  ACE_Message_Block *new_mb = mb.duplicate ();
+
+  ACE_CDR::mb_align (new_mb);
+
+  qd->msg_block_ = new_mb;
+
+  return qd;
+}
+
 int
 TAO_GIOP_Message_Lite::generate_locate_reply_header (
     TAO_OutputCDR & /*cdr*/,
@@ -1651,22 +1679,3 @@ TAO_GIOP_Message_Lite::header_length (void) const
 {
   return TAO_GIOP_LITE_HEADER_LEN;
 }
-
-void
-TAO_GIOP_Message_Lite::set_queued_data_from_message_header (
-  TAO_Queued_Data *qd,
-  const ACE_Message_Block &mb
-  ) const
-{
-  ACE_UNUSED_ARG (qd);
-  ACE_UNUSED_ARG (mb);
-}
-
-int
-TAO_GIOP_Message_Lite::check_for_valid_header (
-  const ACE_Message_Block &mb
-  ) const
-{
-  ACE_UNUSED_ARG (mb);
-  return 0;
-}