ChangeLogTag:Wed Jun 9 20:16:36 1999 Carlos O'Ryan <coryan@cs.wustl.edu>

1 files changed, 15 insertions, 8 deletions

diff --git a/TAO/tao/Reply_Dispatcher.cpp b/TAO/tao/Reply_Dispatcher.cpp
index 0a205c8eeba..e4b560bfc9e 100644
--- a/TAO/tao/Reply_Dispatcher.cpp
+++ b/TAO/tao/Reply_Dispatcher.cpp
@@ -16,8 +16,8 @@ TAO_Reply_Dispatcher::~TAO_Reply_Dispatcher (void)
 {
 }
 
-TAO_InputCDR *
-TAO_Reply_Dispatcher::cdr (void) const
+TAO_GIOP_Message_State *
+TAO_Reply_Dispatcher::message_state (void) const
 {
   return 0;
 }
@@ -25,9 +25,10 @@ TAO_Reply_Dispatcher::cdr (void) const
 // *********************************************************************
 
 // Constructor.
-TAO_Synch_Reply_Dispatcher::TAO_Synch_Reply_Dispatcher (TAO_InputCDR* cdr)
+TAO_Synch_Reply_Dispatcher::
+    TAO_Synch_Reply_Dispatcher (TAO_GIOP_Message_State* message_state)
+  : message_state_ (message_state)
 {
-  this->cdr_ = cdr;
 }
 
 // Destructor.
@@ -40,8 +41,14 @@ int
 TAO_Synch_Reply_Dispatcher::dispatch_reply (CORBA::ULong reply_status,
                                             const TAO_GIOP_Version& version,
                                             TAO_GIOP_ServiceContextList& reply_ctx,
-                                            TAO_InputCDR*)
+                                            TAO_GIOP_Message_State* message_state)
 {
+  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_status_ = reply_status;
   this->version_ = version;
 
@@ -55,8 +62,8 @@ TAO_Synch_Reply_Dispatcher::dispatch_reply (CORBA::ULong reply_status,
   return 0;
 }
 
-TAO_InputCDR *
-TAO_Synch_Reply_Dispatcher::cdr (void) const
+TAO_GIOP_Message_State *
+TAO_Synch_Reply_Dispatcher::message_state (void) const
 {
-  return this->cdr_;
+  return this->message_state_;
 }