diff options
Diffstat (limited to 'TAO/tao/Reply_Dispatcher.cpp')
| -rw-r--r-- | TAO/tao/Reply_Dispatcher.cpp | 26 |
1 files changed, 6 insertions, 20 deletions
diff --git a/TAO/tao/Reply_Dispatcher.cpp b/TAO/tao/Reply_Dispatcher.cpp index b9d4f42e1ac..caa019766bc 100644 --- a/TAO/tao/Reply_Dispatcher.cpp +++ b/TAO/tao/Reply_Dispatcher.cpp @@ -26,8 +26,8 @@ TAO_Reply_Dispatcher::message_state (void) const // ********************************************************************* // 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 (void) + : message_state_ (0) { } @@ -43,14 +43,9 @@ TAO_Synch_Reply_Dispatcher::dispatch_reply (CORBA::ULong reply_status, TAO_GIOP_ServiceContextList &reply_ctx, 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; + this->message_state_ = message_state; // Steal the buffer, that way we don't do any unnecesary copies of // this data. @@ -71,11 +66,9 @@ TAO_Synch_Reply_Dispatcher::message_state (void) const // ********************************************************************* // Constructor. -TAO_Asynch_Reply_Dispatcher::TAO_Asynch_Reply_Dispatcher (TAO_GIOP_Message_State *message_state, - const TAO_Reply_Handler_Skeleton &reply_handler_skel, +TAO_Asynch_Reply_Dispatcher::TAO_Asynch_Reply_Dispatcher (const TAO_Reply_Handler_Skeleton &reply_handler_skel, Messaging::ReplyHandler_ptr reply_handler_ptr) - : message_state_ (message_state), - reply_handler_skel_ (reply_handler_skel), + : reply_handler_skel_ (reply_handler_skel), reply_handler_ (reply_handler_ptr) { } @@ -83,8 +76,6 @@ TAO_Asynch_Reply_Dispatcher::TAO_Asynch_Reply_Dispatcher (TAO_GIOP_Message_State // Destructor. TAO_Asynch_Reply_Dispatcher::~TAO_Asynch_Reply_Dispatcher (void) { - delete message_state_; - message_state_ = 0; } // Dispatch the reply. @@ -94,14 +85,9 @@ TAO_Asynch_Reply_Dispatcher::dispatch_reply (CORBA::ULong reply_status, TAO_GIOP_ServiceContextList &reply_ctx, 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; + this->message_state_ = message_state; // Steal the buffer, that way we don't do any unnecesary copies of // this data. |