Merge tag 'ACE+TAO-6_4_6' into bug_4213-uiop_corbaloc_key

4 files changed, 16 insertions, 14 deletions

diff --git a/TAO/tao/Strategies/SCIOP_Connector.cpp b/TAO/tao/Strategies/SCIOP_Connector.cpp
index 3f88e558447..c7b9e328fde 100644
--- a/TAO/tao/Strategies/SCIOP_Connector.cpp
+++ b/TAO/tao/Strategies/SCIOP_Connector.cpp
@@ -236,12 +236,14 @@ TAO_SCIOP_Connector::make_connection_i (TAO::Profile_Transport_Resolver *r,
       return 0;
     }
 
-  if (svc_handler->keep_waiting ())
+  TAO_Leader_Follower &leader_follower = this->orb_core ()->leader_follower ();
+
+  if (svc_handler->keep_waiting (leader_follower))
     {
       svc_handler->connection_pending ();
     }
 
-  if (svc_handler->error_detected ())
+  if (svc_handler->error_detected (leader_follower))
     {
       svc_handler->cancel_pending_connection ();
       return 0;
@@ -278,7 +280,7 @@ TAO_SCIOP_Connector::make_connection_i (TAO::Profile_Transport_Resolver *r,
       return 0;
     }
 
-  if (svc_handler->error_detected ())
+  if (svc_handler->error_detected (leader_follower))
     {
       svc_handler->cancel_pending_connection ();
       transport->purge_entry();
diff --git a/TAO/tao/Strategies/SHMIOP_Connector.cpp b/TAO/tao/Strategies/SHMIOP_Connector.cpp
index 2f5e4e426be..bcf909b54ee 100644
--- a/TAO/tao/Strategies/SHMIOP_Connector.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Connector.cpp
@@ -173,18 +173,19 @@ TAO_SHMIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *,
       return 0;
     }
 
-  if (svc_handler->keep_waiting ())
+  TAO_Leader_Follower &leader_follower = this->orb_core ()->leader_follower ();
+
+  if (svc_handler->keep_waiting (leader_follower))
     {
       svc_handler->connection_pending ();
     }
 
-  if (svc_handler->error_detected ())
+  if (svc_handler->error_detected (leader_follower))
     {
       svc_handler->cancel_pending_connection ();
     }
 
-  TAO_Transport *transport =
-    svc_handler->transport ();
+  TAO_Transport *transport = svc_handler->transport ();
 
   // At this point, the connection has be successfully connected.
   // #REFCOUNT# is one.
@@ -218,7 +219,7 @@ TAO_SHMIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *,
       return 0;
     }
 
-  if (svc_handler->error_detected ())
+  if (svc_handler->error_detected (leader_follower))
     {
       svc_handler->cancel_pending_connection ();
       transport->purge_entry();
diff --git a/TAO/tao/Strategies/UIOP_Connector.cpp b/TAO/tao/Strategies/UIOP_Connector.cpp
index 552b1bb5a10..c4abd8dd420 100644
--- a/TAO/tao/Strategies/UIOP_Connector.cpp
+++ b/TAO/tao/Strategies/UIOP_Connector.cpp
@@ -210,12 +210,14 @@ TAO_UIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *r,
       return 0;
     }
 
-  if (svc_handler->keep_waiting ())
+  TAO_Leader_Follower &leader_follower = this->orb_core ()->leader_follower ();
+
+  if (svc_handler->keep_waiting (leader_follower))
     {
       svc_handler->connection_pending ();
     }
 
-  if (svc_handler->error_detected ())
+  if (svc_handler->error_detected (leader_follower))
     {
       svc_handler->cancel_pending_connection ();
     }
@@ -250,7 +252,7 @@ TAO_UIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *r,
       return 0;
     }
 
-  if (svc_handler->error_detected ())
+  if (svc_handler->error_detected (leader_follower))
     {
       svc_handler->cancel_pending_connection ();
       transport->purge_entry();
diff --git a/TAO/tao/Strategies/advanced_resource.h b/TAO/tao/Strategies/advanced_resource.h
index 016f626cd92..95ce2b4408c 100644
--- a/TAO/tao/Strategies/advanced_resource.h
+++ b/TAO/tao/Strategies/advanced_resource.h
@@ -111,9 +111,6 @@ protected:
   /// List of loaded protocol factories.
   TAO_ProtocolFactorySet protocol_factories_;
 
-  /// The type of reactor registry.
-  int reactor_registry_type_;
-
   /// Flag indicating which kind of reactor we should use.
   int reactor_type_;