diff options
| author | jai <jai@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2007-01-29 19:16:40 +0000 |
|---|---|---|
| committer | jai <jai@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2007-01-29 19:16:40 +0000 |
| commit | 306f0932766368d4a56082698f9ec7f7f734a4f7 (patch) | |
| tree | 18ee4d7e9fc15e1cf9a9c25096644bf38d151f7e | |
| parent | 6d3197598c15e5e0949dc3ab3cd6c773254cba0d (diff) | |
| download | ATCD-306f0932766368d4a56082698f9ec7f7f734a4f7.tar.gz | |
changes for DS library
| -rw-r--r-- | TAO/ChangeLog | 7 | ||||
| -rw-r--r-- | TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp | 15 |
2 files changed, 17 insertions, 5 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index ae9b037e9d1..b112c7df636 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,10 @@ +Mon Jan 29 19:15:19 UTC 2007 Jaiganesh B <jai.dre.vanderbilt.edu> + + * tao/RTPortableServer/RT_Servant_Dispatcher.cpp: + + Made changes to use the right "get" protocols hooks function + to obtain the right protocols hooks piece to use. + Mon Jan 29 19:07:44 UTC 2007 Jaiganesh B <jai.dre.vanderbilt.edu> * tao/RTCORBA/RT_Current.cpp: diff --git a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp index 37b6fe4c305..d6fc11f0fd7 100644 --- a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp +++ b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp @@ -12,6 +12,8 @@ #include "tao/Connection_Handler.h" #include "tao/Service_Context.h" #include "tao/Protocols_Hooks.h" +#include "tao/Thread_Priority_Protocols_Hooks.h" +#include "tao/Policy_Protocols_Hooks.h" #include "tao/debug.h" #include "tao/CDR.h" @@ -80,8 +82,11 @@ TAO_RT_Servant_Dispatcher::pre_invoke_remote_request ( } // Remember current thread's priority. - TAO_Protocols_Hooks *tph = - poa.orb_core ().get_protocols_hooks (); + TAO_Thread_Priority_Protocols_Hooks *tph = + poa.orb_core ().get_thread_priority_protocols_hooks (); + + TAO_Policy_Protocols_Hooks *pph = + poa.orb_core ().get_policy_protocols_hooks (); const char *priority_model = 0; RTCORBA::Priority target_priority = TAO_INVALID_PRIORITY; @@ -259,7 +264,7 @@ TAO_RT_Servant_Dispatcher::pre_invoke_remote_request ( ACE_CHECK; CORBA::Boolean set_server_network_priority = - tph->set_server_network_priority (req.transport ()->tag (), + pph->set_server_network_priority (req.transport ()->tag (), policy.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; @@ -356,8 +361,8 @@ TAO_RT_Servant_Dispatcher::post_invoke (TAO_Root_POA &poa, { // Reset the priority of the current thread back to its original // value. - TAO_Protocols_Hooks *tph = - poa.orb_core ().get_protocols_hooks (); + TAO_Thread_Priority_Protocols_Hooks *tph = + poa.orb_core ().get_thread_priority_protocols_hooks (); if (tph->set_thread_native_priority ( pre_invoke_state.original_native_priority_ |