diff options
| author | jai <jai@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2007-01-29 17:58:53 +0000 |
|---|---|---|
| committer | jai <jai@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2007-01-29 17:58:53 +0000 |
| commit | 01f10467da324e8748174ecf9d86262d1b7c8e78 (patch) | |
| tree | b29cc49b69b2eaf082cbf0fb496ba7b03b1a5b3b | |
| parent | 2b2a5ee87924f0cacf066651127746672a413a5f (diff) | |
| download | ATCD-01f10467da324e8748174ecf9d86262d1b7c8e78.tar.gz | |
changes for DS library
| -rw-r--r-- | TAO/tao/IIOP_Connection_Handler.cpp | 10 | ||||
| -rw-r--r-- | TAO/tao/ORB_Core.cpp | 4 |
2 files changed, 8 insertions, 6 deletions
diff --git a/TAO/tao/IIOP_Connection_Handler.cpp b/TAO/tao/IIOP_Connection_Handler.cpp index 283580e4d6d..ac7ec17c075 100644 --- a/TAO/tao/IIOP_Connection_Handler.cpp +++ b/TAO/tao/IIOP_Connection_Handler.cpp @@ -10,6 +10,8 @@ #include "tao/Thread_Lane_Resources.h" #include "tao/Base_Transport_Property.h" #include "tao/Protocols_Hooks.h" +#include "tao/Policy_Protocols_Hooks.h" +#include "tao/Protocols_Properties_Protocols_Hooks.h" #include "tao/Wait_Strategy.h" #include "ace/os_include/netinet/os_tcp.h" @@ -92,8 +94,8 @@ TAO_IIOP_Connection_Handler::open (void*) protocol_properties.dont_route_ = this->orb_core ()->orb_params ()->sock_dontroute (); - 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 const client = this->transport ()->opened_as () == TAO::TAO_CLIENT_ROLE; @@ -507,8 +509,8 @@ TAO_IIOP_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/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp index a9e1028e32d..8b2d19f52c5 100644 --- a/TAO/tao/ORB_Core.cpp +++ b/TAO/tao/ORB_Core.cpp @@ -1930,13 +1930,13 @@ TAO_ORB_Core::service_context_list ( ACE_ENV_ARG_DECL) { // @NOTE: Can use Interceptors instead.. - this->protocols_hooks_->rt_service_context (stub, + this->policy_protocols_hooks_->rt_service_context (stub, service_context, restart ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->protocols_hooks_->np_service_context (stub, + this->network_priority_protocols_hooks_->np_service_context (stub, service_context, restart ACE_ENV_ARG_PARAMETER); |