*** empty log message ***

4 files changed, 16 insertions, 8 deletions

diff --git a/TAO/tao/GIOP_Message_Base.cpp b/TAO/tao/GIOP_Message_Base.cpp
index bb8bc4df912..9de264693e8 100644
--- a/TAO/tao/GIOP_Message_Base.cpp
+++ b/TAO/tao/GIOP_Message_Base.cpp
@@ -185,7 +185,7 @@ TAO_GIOP_Message_Base::generate_reply_header (
 int
 TAO_GIOP_Message_Base::read_message (TAO_Transport *transport,
                                      int /*block */,
-                                     ACE_Time_Value *max_wait_time)
+                                     ACE_Time_Value * /*max_wait_time*/)
 {
   // Call the handler to read and do a simple parse of the header of
   // the message.
@@ -329,7 +329,7 @@ TAO_GIOP_Message_Base::process_request_message (TAO_Transport *transport,
   // same Event_Handler in two threads at the same time.
 
   // Steal the input CDR from the message block
-  TAO_InputCDR input_cdr (msg_block->data_block (),
+  TAO_InputCDR input_cdr (msg_block->data_block ()->duplicate (),
                           ACE_CDR_BYTE_ORDER,
                           orb_core);
 
@@ -350,6 +350,8 @@ TAO_GIOP_Message_Base::process_request_message (TAO_Transport *transport,
   msg_block->reset ();
   this->message_handler_.message_state ().reset (0);
 
+
+  int retval = 0;
   // We know we have some request message. Check whether it is a
   // GIOP_REQUEST or GIOP_LOCATE_REQUEST to take action.
   switch (this->message_handler_.message_state ().message_type)
@@ -361,12 +363,13 @@ TAO_GIOP_Message_Base::process_request_message (TAO_Transport *transport,
       return this->process_request (transport,
                                     orb_core,
                                     input_cdr);
+
     case TAO_GIOP_LOCATEREQUEST:
       return this->process_locate_request (transport,
                                            orb_core,
                                            input_cdr);
     default:
-      return -1;
+    return -1;
     }
 }
 
@@ -380,7 +383,7 @@ TAO_GIOP_Message_Base::process_reply_message (
     this->message_handler_.message_block ();
 
   // Steal the input CDR from the message block
-  TAO_InputCDR input_cdr (msg_block->data_block (),
+  TAO_InputCDR input_cdr (msg_block->data_block ()->duplicate (),
                           ACE_CDR_BYTE_ORDER);
 
   // When the data block is used for creating the CDR stream, we loose
@@ -402,11 +405,13 @@ TAO_GIOP_Message_Base::process_reply_message (
       // Should be taken care by the state specific parsing
       return this->generator_parser_->parse_reply (input_cdr,
                                                    params);
+
+
     case TAO_GIOP_LOCATEREPLY:
       return this->generator_parser_->parse_locate_reply (input_cdr,
                                                           params);
-    default:
-      return -1;
+      default:
+        return -1;
     }
 }
 
@@ -506,14 +511,15 @@ TAO_GIOP_Message_Base::process_request (TAO_Transport *transport,
   CORBA::ULong request_id = 0;
   CORBA::Boolean response_required = 0;
 
-  cout << "Amba are we here " <<endl;
   int parse_error = 0;
 
+
   ACE_TRY
     {
       parse_error =
         this->generator_parser_->parse_request_header (request);
 
+
       // Throw an exception if the
       if (parse_error != 0)
         ACE_TRY_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
diff --git a/TAO/tao/GIOP_Message_Handler.cpp b/TAO/tao/GIOP_Message_Handler.cpp
index a8f1267bb4c..232c0744e4b 100644
--- a/TAO/tao/GIOP_Message_Handler.cpp
+++ b/TAO/tao/GIOP_Message_Handler.cpp
@@ -28,6 +28,7 @@ TAO_GIOP_Message_Handler::
 int
 TAO_GIOP_Message_Handler::read_parse_message (TAO_Transport *transport)
 {
+  cout << "The wr_ptr is " << this->current_buffer_.wr_ptr () <<endl;
   // Read the message from the transport
   ssize_t n = transport->read (this->current_buffer_.wr_ptr (),
                                this->message_size_);
diff --git a/TAO/tao/IIOP_Transport.cpp b/TAO/tao/IIOP_Transport.cpp
index 6453937dd6a..21507a6f672 100644
--- a/TAO/tao/IIOP_Transport.cpp
+++ b/TAO/tao/IIOP_Transport.cpp
@@ -149,7 +149,7 @@ TAO_IIOP_Transport::recv (char *buf,
 ssize_t
 TAO_IIOP_Transport::read (char *buf,
                           size_t len,
-                          const ACE_Time_Value *max_wait_time)
+                          const ACE_Time_Value * /*max_wait_time*/)
 {
   return ACE::recv (this->handle (),
                     (void *) buf,
diff --git a/TAO/tao/Makefile b/TAO/tao/Makefile
index 9e2f33553cf..668ca156379 100644
--- a/TAO/tao/Makefile
+++ b/TAO/tao/Makefile
@@ -97,6 +97,7 @@ PLUGGABLE_MESSAGING_FILES = \
   Pluggable_Messaging \
   Pluggable_Messaging_Utils \
   GIOP_Message_Base \
+  GIOP_Message_Handler \
   GIOP_Message_Lite \
   GIOP_Message_Generator_Parser \
   GIOP_Message_Generator_Parser_10 \