ChangeLogTag: Thu Dec 7 17:36:47 2000 Balachandran Natarajan <bala@cs.wustl.edu>

1 files changed, 18 insertions, 14 deletions

diff --git a/TAO/tao/Asynch_Reply_Dispatcher.h b/TAO/tao/Asynch_Reply_Dispatcher.h
index 7cdd6e634ba..b03986d30fe 100644
--- a/TAO/tao/Asynch_Reply_Dispatcher.h
+++ b/TAO/tao/Asynch_Reply_Dispatcher.h
@@ -28,11 +28,16 @@
 
 #include "tao/Reply_Dispatcher.h"
 
+class TAO_Pluggable_Reply_Params;
+class TAO_ORB_Core ;
+
+
+
 #if (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1)
 #include "tao/MessagingC.h"
 #endif /* (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1) == 0 */
 
-class TAO_Export TAO_Asynch_Reply_Dispatcher_Base 
+class TAO_Export TAO_Asynch_Reply_Dispatcher_Base
   : public TAO_Reply_Dispatcher
 {
   // = TITLE
@@ -42,7 +47,7 @@ class TAO_Export TAO_Asynch_Reply_Dispatcher_Base
   //    Base class for TAO_Asynch_Reply_Dispatcher and
   //    TAO_DII_Deferred_Reply_Dispatcher.
 public:
-  TAO_Asynch_Reply_Dispatcher_Base (void);
+  TAO_Asynch_Reply_Dispatcher_Base (TAO_ORB_Core *orb_core);
   // Default constructor.
 
   virtual ~TAO_Asynch_Reply_Dispatcher_Base (void);
@@ -52,12 +57,9 @@ public:
   // Sets the transport for this invocation.
 
   // = The Reply Dispatcher methods
-  virtual int dispatch_reply (CORBA::ULong reply_status,
-                              const TAO_GIOP_Version &version,
-                              IOP::ServiceContextList &reply_ctx,
-                              TAO_GIOP_Message_State *message_state);
+  virtual int dispatch_reply (TAO_Pluggable_Reply_Params &params);
 
-  virtual TAO_GIOP_Message_State *message_state (void);
+  // virtual TAO_GIOP_Message_State *message_state (void);
 
   virtual void dispatcher_bound (TAO_Transport *t);
 
@@ -71,9 +73,13 @@ protected:
   // because our TAO_Asynch_Invocation or TAO_DII_Deferred_Invocation
   // will go out of scope before we are done.
 
-  TAO_GIOP_Message_State *message_state_;
+  // TAO_GIOP_Message_State *message_state_;
   // CDR stream for reading the input.
 
+  TAO_InputCDR reply_cdr_;
+  // CDR stream which has the reply information that needs to be
+  // demarshalled by the stubs
+
   TAO_Transport *transport_;
   // This invocation is using this transport, may change...
 };
@@ -82,7 +88,7 @@ protected:
 
 #if (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1)
 
-class TAO_Export TAO_Asynch_Reply_Dispatcher 
+class TAO_Export TAO_Asynch_Reply_Dispatcher
   : public TAO_Asynch_Reply_Dispatcher_Base
 {
   // = TITLE
@@ -93,7 +99,8 @@ class TAO_Export TAO_Asynch_Reply_Dispatcher
 public:
   TAO_Asynch_Reply_Dispatcher (
       const TAO_Reply_Handler_Skeleton &reply_handler_skel,
-      Messaging::ReplyHandler_ptr reply_handler_ptr
+      Messaging::ReplyHandler_ptr reply_handler_ptr,
+      TAO_ORB_Core *orb_core
     );
  // Constructor.
 
@@ -101,10 +108,7 @@ public:
   // Destructor.
 
   // = The Reply Dispatcher methods
-  virtual int dispatch_reply (CORBA::ULong reply_status,
-                              const TAO_GIOP_Version &version,
-                              IOP::ServiceContextList &reply_ctx,
-                              TAO_GIOP_Message_State *message_state);
+  virtual int dispatch_reply (TAO_Pluggable_Reply_Params &params);
 
   virtual void connection_closed (void);