ChangeLogTag: Mon Dec 18 18:37:53 2000 Priyanka Gontla <pgontla@ece.uci.edu>

1 files changed, 22 insertions, 41 deletions

diff --git a/TAO/tao/IIOP_Connector.cpp b/TAO/tao/IIOP_Connector.cpp
index fb4115ad299..d9bcf979eeb 100644
--- a/TAO/tao/IIOP_Connector.cpp
+++ b/TAO/tao/IIOP_Connector.cpp
@@ -10,13 +10,12 @@
 #include "tao/Client_Strategy_Factory.h"
 #include "tao/Environment.h"
 #include "ace/Auto_Ptr.h"
-#include "tao/RT_Policy_i.h"
 #include "tao/Base_Connection_Property.h"
+#include "tao/Protocols_Hooks.h"
 #include "ace/Strategies_T.h"
 
 ACE_RCSID(tao, IIOP_Connector, "$Id$")
 
-
 TAO_IIOP_Connector::TAO_IIOP_Connector (CORBA::Boolean flag)
   : TAO_Connector (TAO_TAG_IIOP_PROFILE),
     lite_flag_ (flag),
@@ -447,48 +446,30 @@ TAO_IIOP_Connector::init_tcp_properties (void)
 
   ACE_DECLARE_NEW_CORBA_ENV;
 
-  // Check ORB-level override for tcp properties.
-  TAO_ClientProtocolPolicy *client_protocols =
-    this->orb_core ()->policy_manager ()->client_protocol ();
-  CORBA::Object_var auto_release = client_protocols;
-  RTCORBA::TCPProtocolProperties_var tcp_properties =
-    RTCORBA::TCPProtocolProperties::_nil ();
-
-  if (client_protocols != 0)
+  RTCORBA::ProtocolProperties_var properties = 
+    RTCORBA::ProtocolProperties::_nil ();
+    
+  TAO_Protocols_Hooks *tph = this->orb_core ()->get_protocols_hooks ();
+  
+  if (tph != 0)
     {
-      RTCORBA::ProtocolList & protocols = client_protocols->protocols_rep ();
-
-      for (CORBA::ULong j = 0; j < protocols.length (); ++j)
-        if (protocols[j].protocol_type == TAO_TAG_IIOP_PROFILE)
-          {
-            tcp_properties =
-              RTCORBA::TCPProtocolProperties::_narrow
-            (protocols[j].transport_protocol_properties.in (),
-             ACE_TRY_ENV);
-            ACE_CHECK_RETURN (-1);
-            break;
-          }
-    }
+      const char protocol [] = "iiop";
+      const char *protocol_type = protocol;
 
-  if (CORBA::is_nil (tcp_properties.in ()))
-    {
-      // No tcp properties in ORB-level override.  Use ORB defaults.
-      // Orb defaults should never be null - they were initialized by
-      // the ORB_Core.
-      client_protocols = this->orb_core ()->default_client_protocol ();
-      auto_release = client_protocols;
-      RTCORBA::ProtocolList & protocols = client_protocols->protocols_rep ();
-      for (CORBA::ULong j = 0; j < protocols.length (); ++j)
-        if (protocols[j].protocol_type == TAO_TAG_IIOP_PROFILE)
-          {
-            tcp_properties =
-              RTCORBA::TCPProtocolProperties::_narrow
-              (protocols[j].transport_protocol_properties.in (),
-               ACE_TRY_ENV);
-            ACE_CHECK_RETURN (-1);
-            break;
-          }
+      int hook_result =
+        tph->call_client_protocols_hook (this->orb_core (),
+                                         properties,
+                                         protocol_type);
+
+      if(hook_result == -1)
+        return -1;
     }
+  
+  RTCORBA::TCPProtocolProperties_var tcp_properties =
+    RTCORBA::TCPProtocolProperties::_narrow (properties.in (),
+                                             ACE_TRY_ENV);
+  ACE_CHECK_RETURN (-1);
+
 
   // Extract and locally store properties of interest.
   this->tcp_properties_.send_buffer_size =