1 files changed, 93 insertions, 17 deletions

diff --git a/TAO/tao/Reply_Dispatcher.cpp b/TAO/tao/Reply_Dispatcher.cpp
index e819776faab..0185b43958d 100644
--- a/TAO/tao/Reply_Dispatcher.cpp
+++ b/TAO/tao/Reply_Dispatcher.cpp
@@ -1,6 +1,8 @@
 // $Id$
 
 #include "tao/Reply_Dispatcher.h"
+#include "tao/debug.h"
+#include "tao/ORB_Core.h"
 
 #if !defined (__ACE_INLINE__)
 #include "tao/Reply_Dispatcher.i"
@@ -8,6 +10,7 @@
 
 // Constructor.
 TAO_Reply_Dispatcher::TAO_Reply_Dispatcher (void)
+  //  : reply_received_ (0)
 {
 }
 
@@ -22,12 +25,20 @@ TAO_Reply_Dispatcher::message_state (void) const
   return 0;
 }
 
+// int
+// TAO_Reply_Dispatcher::reply_received (void) const
+// {
+//   return reply_received_;
+// }
+
 // *********************************************************************
 
 // Constructor.
-TAO_Synch_Reply_Dispatcher::
-    TAO_Synch_Reply_Dispatcher (TAO_GIOP_Message_State* message_state)
-  : message_state_ (message_state)
+TAO_Synch_Reply_Dispatcher::TAO_Synch_Reply_Dispatcher (TAO_ORB_Core *orb_core)
+  : message_state_ (0),
+    reply_cdr_ (orb_core->create_input_cdr_data_block (ACE_CDR::DEFAULT_BUFSIZE),
+                TAO_ENCAP_BYTE_ORDER,
+                orb_core)
 {
 }
 
@@ -39,22 +50,15 @@ TAO_Synch_Reply_Dispatcher::~TAO_Synch_Reply_Dispatcher (void)
 // Dispatch the reply.
 int
 TAO_Synch_Reply_Dispatcher::dispatch_reply (CORBA::ULong reply_status,
-                                            const TAO_GIOP_Version& version,
-                                            TAO_GIOP_ServiceContextList& reply_ctx,
-                                            TAO_GIOP_Message_State* message_state)
+                                            const TAO_GIOP_Version &version,
+                                            TAO_GIOP_ServiceContextList &reply_ctx,
+                                            TAO_GIOP_Message_State *message_state)
 {
-# if defined (ACE_NDEBUG)
-    ACE_UNUSED_ARG (message_state);
-# endif /* ACE_NDEBUG */
-
-  ACE_ASSERT (message_state == this->message_state_);
-  // @@ Notice that the message is ignored because we assume that
-  //    the message_state is the same we are giving down to the ORB to
-  //    use.... I.E. this class cannot be used with Muxed stream, but
-  //    chances are that the way to implement that will change several
-  //    times in the next few weeks.
+  // this->reply_received_ = 1;
+
   this->reply_status_ = reply_status;
   this->version_ = version;
+  this->message_state_ = message_state;
 
   // Steal the buffer, that way we don't do any unnecesary copies of
   // this data.
@@ -63,7 +67,10 @@ TAO_Synch_Reply_Dispatcher::dispatch_reply (CORBA::ULong reply_status,
   TAO_GIOP_ServiceContext* context_list = reply_ctx.get_buffer (1);
   this->reply_ctx_.replace (max, len, context_list, 1);
 
-  return 1;
+  // Steal the buffer so that no copying is done.
+  this->reply_cdr_.reset (message_state->cdr.steal_contents (),
+                          message_state->cdr.byte_order ());
+  return 0;
 }
 
 TAO_GIOP_Message_State *
@@ -71,3 +78,72 @@ TAO_Synch_Reply_Dispatcher::message_state (void) const
 {
   return this->message_state_;
 }
+
+TAO_InputCDR &
+TAO_Synch_Reply_Dispatcher::reply_cdr (void)
+{
+  return this->reply_cdr_;
+}
+
+
+// *********************************************************************
+#if defined (TAO_HAS_CORBA_MESSAGING) && defined (TAO_POLLER)
+// Constructor.
+TAO_Asynch_Reply_Dispatcher::TAO_Asynch_Reply_Dispatcher (const TAO_Reply_Handler_Skeleton &reply_handler_skel,
+                                                          Messaging::ReplyHandler_ptr reply_handler_ptr)
+  : reply_handler_skel_ (reply_handler_skel),
+    reply_handler_ (reply_handler_ptr)
+{
+}
+
+// Destructor.
+TAO_Asynch_Reply_Dispatcher::~TAO_Asynch_Reply_Dispatcher (void)
+{
+}
+
+// Dispatch the reply.
+int
+TAO_Asynch_Reply_Dispatcher::dispatch_reply (CORBA::ULong reply_status,
+                                             const TAO_GIOP_Version &version,
+                                             TAO_GIOP_ServiceContextList &reply_ctx,
+                                             TAO_GIOP_Message_State *message_state)
+{
+  // this->reply_received_ = 1;
+
+  this->reply_status_ = reply_status;
+  this->version_ = version;
+  this->message_state_ = message_state;
+
+  // Steal the buffer, that way we don't do any unnecesary copies of
+  // this data.
+  CORBA::ULong max = reply_ctx.maximum ();
+  CORBA::ULong len = reply_ctx.length ();
+  TAO_GIOP_ServiceContext* context_list = reply_ctx.get_buffer (1);
+  this->reply_ctx_.replace (max, len, context_list, 1);
+
+  if (TAO_debug_level >= 4)
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  "(%P | %t):TAO_Asynch_Reply_Dispatcher::dispatch_reply:\n"));
+    }
+
+  ACE_DECLARE_NEW_CORBA_ENV;
+
+  // Call the Reply Handler's skeleton.
+  reply_handler_skel_ (message_state_->cdr,
+                       reply_handler_,
+                       ACE_TRY_ENV);
+
+  // This was dynamically allocated. Now the job is done. Commit
+  // suicide here.
+  delete this;
+
+  return 0;
+}
+
+TAO_GIOP_Message_State *
+TAO_Asynch_Reply_Dispatcher::message_state (void) const
+{
+  return this->message_state_;
+}
+#endif /* TAO_HAS_CORBA_MESSAGING && TAO_POLLER */