Sun Nov 6 18:08:29 UTC 2011 Martin Corino <mcorino@remedy.nl>

        * tao/CDR.cpp:
        * tao/Exclusive_TMS.cpp:
        * tao/GIOP_Message_Base.cpp:
        * tao/IIOP_Transport.h:
        * tao/LocateRequest_Invocation.cpp:
        * tao/Message_Semantics.h:
        * tao/Messaging/AMH_Response_Handler.cpp:
        * tao/Messaging/Asynch_Invocation.cpp:
        * tao/Strategies/COIOP_Transport.h:
        * tao/Strategies/DIOP_Transport.h:
        * tao/Strategies/SCIOP_Transport.h:
        * tao/Strategies/SHMIOP_Transport.h:
        * tao/Strategies/UIOP_Transport.h:
        * tao/Synch_Invocation.cpp:
        * tao/TAO_Server_Request.cpp:
        * tao/Transport.cpp:
        * tao/Transport.h:
        * tao/Wait_On_Leader_Follower.cpp:
        * tao/Wait_On_Leader_Follower.h:
        * tao/Wait_On_Read.cpp:
        * tao/Wait_On_Read.h:
        * tao/Wait_Strategy.cpp:
        * tao/Wait_Strategy.h:

          Changes to make the RW client wait strategy (in combination with
          the Exclusive transport muxing strategy) play nice with AMI.
          The essence of the problem of RW not working with AMI was that
          AMI requires transports to be registered with the reactor (so
          reply events can be handled) which is what RW prevented for all
          client transports.
          The changes provide a means for RW to recognize transports for
          Async client requests and register these with the reactor just
          before sending the request and removing them from the reactor
          again when the request has finished (reply received, timed out
          or disconnected).

5 files changed, 5 insertions, 5 deletions

diff --git a/TAO/tao/Strategies/COIOP_Transport.h b/TAO/tao/Strategies/COIOP_Transport.h
index 597899a0b71..e80adec2978 100644
--- a/TAO/tao/Strategies/COIOP_Transport.h
+++ b/TAO/tao/Strategies/COIOP_Transport.h
@@ -99,7 +99,7 @@ public:
 
   virtual int send_message (TAO_OutputCDR &stream,
                             TAO_Stub *stub = 0,
-                            TAO_Message_Semantics message_semantics = TAO_TWOWAY_REQUEST,
+                            TAO_Message_Semantics message_semantics = TAO_Message_Semantics (),
                             ACE_Time_Value *max_time_wait = 0);
 
 private:
diff --git a/TAO/tao/Strategies/DIOP_Transport.h b/TAO/tao/Strategies/DIOP_Transport.h
index 3aefc215c63..1cba2212e5c 100644
--- a/TAO/tao/Strategies/DIOP_Transport.h
+++ b/TAO/tao/Strategies/DIOP_Transport.h
@@ -98,7 +98,7 @@ public:
 
   virtual int send_message (TAO_OutputCDR &stream,
                             TAO_Stub *stub = 0,
-                            TAO_Message_Semantics message_semantics = TAO_TWOWAY_REQUEST,
+                            TAO_Message_Semantics message_semantics = TAO_Message_Semantics (),
                             ACE_Time_Value *max_time_wait = 0);
 
 private:
diff --git a/TAO/tao/Strategies/SCIOP_Transport.h b/TAO/tao/Strategies/SCIOP_Transport.h
index 7f1787c40b2..b46bbda512f 100644
--- a/TAO/tao/Strategies/SCIOP_Transport.h
+++ b/TAO/tao/Strategies/SCIOP_Transport.h
@@ -90,7 +90,7 @@ public:
 
   virtual int send_message (TAO_OutputCDR &association,
                             TAO_Stub *stub = 0,
-                            TAO_Message_Semantics message_semantics = TAO_TWOWAY_REQUEST,
+                            TAO_Message_Semantics message_semantics = TAO_Message_Semantics (),
                             ACE_Time_Value *max_time_wait = 0);
 
   /*virtual int send_reply (TAO_OutputCDR &stream,
diff --git a/TAO/tao/Strategies/SHMIOP_Transport.h b/TAO/tao/Strategies/SHMIOP_Transport.h
index 63d446f547a..186f6a62860 100644
--- a/TAO/tao/Strategies/SHMIOP_Transport.h
+++ b/TAO/tao/Strategies/SHMIOP_Transport.h
@@ -96,7 +96,7 @@ public:
 
   virtual int send_message (TAO_OutputCDR &stream,
                             TAO_Stub *stub = 0,
-                            TAO_Message_Semantics message_semantics = TAO_TWOWAY_REQUEST,
+                            TAO_Message_Semantics message_semantics = TAO_Message_Semantics (),
                             ACE_Time_Value *max_time_wait = 0);
 
 private:
diff --git a/TAO/tao/Strategies/UIOP_Transport.h b/TAO/tao/Strategies/UIOP_Transport.h
index a0dfe3fbda3..d103a35da5f 100644
--- a/TAO/tao/Strategies/UIOP_Transport.h
+++ b/TAO/tao/Strategies/UIOP_Transport.h
@@ -90,7 +90,7 @@ public:
 
   virtual int send_message (TAO_OutputCDR &stream,
                             TAO_Stub *stub = 0,
-                            TAO_Message_Semantics message_semantics = TAO_TWOWAY_REQUEST,
+                            TAO_Message_Semantics message_semantics = TAO_Message_Semantics (),
                             ACE_Time_Value *max_time_wait = 0);
   //@}