changes to the DS library

5 files changed, 30 insertions, 12 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 0b2f987b178..0c62ebcb2fe 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,13 @@
+Mon Jan 29 18:05:47 UTC 2007  Jaiganesh B  <jai.dre.vanderbilt.edu>
+
+        * tao/Strategies/UIOP_Connection_Handler.cpp:
+          tao/Strategies/DIOP_Connection_Handler.cpp:
+          tao/Strategies/SCIOP_Connection_Handler.cpp:
+          tao/Strategies/SHMIOP_Connection_Handler.cpp:
+        
+          Made changes to use the right "get" protocols hooks function
+          to obtain the right protocols hooks piece to use.
+
 Mon Jan 29 17:57:17 UTC 2007  Jaiganesh B  <jai.dre.vanderbilt.edu>
 
         * tao/ORB_Core.cpp:
diff --git a/TAO/tao/Strategies/DIOP_Connection_Handler.cpp b/TAO/tao/Strategies/DIOP_Connection_Handler.cpp
index 3866c13e327..e39f4de68cf 100644
--- a/TAO/tao/Strategies/DIOP_Connection_Handler.cpp
+++ b/TAO/tao/Strategies/DIOP_Connection_Handler.cpp
@@ -14,6 +14,8 @@
 #include "tao/Thread_Lane_Resources.h"
 #include "tao/Base_Transport_Property.h"
 #include "tao/Protocols_Hooks.h"
+#include "tao/Protocols_Properties_Protocols_Hooks.h"
+#include "tao/Policy_Protocols_Hooks.h"
 #include "tao/Resume_Handle.h"
 
 #include "tao/Strategies/DIOP_Transport.h"
@@ -118,8 +120,8 @@ TAO_DIOP_Connection_Handler::open (void*)
   // for consistency with other protocols.
   TAO_DIOP_Protocol_Properties protocol_properties;
 
-  TAO_Protocols_Hooks *tph =
-    this->orb_core ()->get_protocols_hooks ();
+  TAO_Protocols_Properties_Protocols_Hooks *tph =
+    this->orb_core ()->get_protocols_properties_protocols_hooks ();
 
   bool client =
     this->transport ()->opened_as () == TAO::TAO_CLIENT_ROLE;
@@ -299,8 +301,8 @@ TAO_DIOP_Connection_Handler::set_dscp_codepoint (CORBA::Boolean set_network_prio
 
   if (set_network_priority)
     {
-      TAO_Protocols_Hooks *tph =
-        this->orb_core ()->get_protocols_hooks ();
+      TAO_Policy_Protocols_Hooks *tph =
+        this->orb_core ()->get_policy_protocols_hooks ();
 
       CORBA::Long codepoint =
         tph->get_dscp_codepoint ();
diff --git a/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp b/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp
index 3f5cc49c3c9..74b088aa60a 100644
--- a/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp
+++ b/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp
@@ -26,6 +26,8 @@
 #include "tao/Base_Transport_Property.h"
 #include "tao/Resume_Handle.h"
 #include "tao/Protocols_Hooks.h"
+#include "tao/Protocols_Properties_Protocols_Hooks.h"
+#include "tao/Policy_Protocols_Hooks.h"
 #include "tao/Wait_Strategy.h"
 
 ACE_RCSID (tao,
@@ -94,8 +96,8 @@ TAO_SCIOP_Connection_Handler::open (void*)
   protocol_properties.no_delay_ =
     this->orb_core ()->orb_params ()->nodelay ();
 
-  TAO_Protocols_Hooks *tph =
-    this->orb_core ()->get_protocols_hooks ();
+  TAO_Protocols_Properties_Protocols_Hooks *tph =
+    this->orb_core ()->get_protocols_properties_protocols_hooks ();
 
   bool client =
     this->transport ()->opened_as () == TAO::TAO_CLIENT_ROLE;;
@@ -384,8 +386,8 @@ TAO_SCIOP_Connection_Handler::set_dscp_codepoint (CORBA::Boolean set_network_pri
 
   if (set_network_priority)
     {
-      TAO_Protocols_Hooks *tph =
-        this->orb_core ()->get_protocols_hooks ();
+      TAO_Policy_Protocols_Hooks *tph =
+        this->orb_core ()->get_policy_protocols_hooks ();
 
       CORBA::Long codepoint =
         tph->get_dscp_codepoint ();
diff --git a/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp b/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp
index a584be7e368..0886f36c0b5 100644
--- a/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp
@@ -16,6 +16,8 @@
 #include "tao/Strategies/SHMIOP_Endpoint.h"
 #include "tao/Resume_Handle.h"
 #include "tao/Protocols_Hooks.h"
+#include "tao/Protocols_Properties_Protocols_Hooks.h"
+#include "tao/Policy_Protocols_Hooks.h"
 
 #include "ace/os_include/netinet/os_tcp.h"
 #include "ace/os_include/os_netdb.h"
@@ -77,8 +79,8 @@ TAO_SHMIOP_Connection_Handler::open (void*)
   protocol_properties.no_delay_ =
     this->orb_core ()->orb_params ()->nodelay ();
 
-  TAO_Protocols_Hooks *tph =
-    this->orb_core ()->get_protocols_hooks ();
+  TAO_Protocols_Properties_Protocols_Hooks *tph =
+    this->orb_core ()->get_protocols_properties_protocols_hooks ();
 
   bool client =
     this->transport ()->opened_as () == TAO::TAO_CLIENT_ROLE;;
diff --git a/TAO/tao/Strategies/UIOP_Connection_Handler.cpp b/TAO/tao/Strategies/UIOP_Connection_Handler.cpp
index f7f754cb197..cebeacf7a00 100644
--- a/TAO/tao/Strategies/UIOP_Connection_Handler.cpp
+++ b/TAO/tao/Strategies/UIOP_Connection_Handler.cpp
@@ -18,6 +18,8 @@
 #include "tao/Resume_Handle.h"
 #include "tao/Thread_Lane_Resources.h"
 #include "tao/Protocols_Hooks.h"
+#include "tao/Protocols_Properties_Protocols_Hooks.h"
+#include "tao/Policy_Protocols_Hooks.h"
 
 ACE_RCSID (Strategies,
            UIOP_Connection_Handler,
@@ -75,8 +77,8 @@ TAO_UIOP_Connection_Handler::open (void*)
   protocol_properties.recv_buffer_size_ =
     this->orb_core ()->orb_params ()->sock_rcvbuf_size ();
 
-  TAO_Protocols_Hooks *tph =
-    this->orb_core ()->get_protocols_hooks ();
+  TAO_Protocols_Properties_Protocols_Hooks *tph =
+    this->orb_core ()->get_protocols_properties_protocols_hooks ();
 
   bool client =
     this->transport ()->opened_as () == TAO::TAO_CLIENT_ROLE;;