diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-03-17 11:09:51 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-03-17 11:09:51 +0000 |
| commit | 44f9a293c647b6ad2167221225253c793147c9b2 (patch) | |
| tree | 45638523cb00507ff702926eac0159e16f72e50d /TAO | |
| parent | 101669d6735a3703ae8bab0d3b608f5b87b9905a (diff) | |
| download | ATCD-44f9a293c647b6ad2167221225253c793147c9b2.tar.gz | |
Diffstat (limited to 'TAO')
| -rw-r--r-- | TAO/tao/DiffServPolicy/DiffServ_Service_Context_Handler.cpp | 6 | ||||
| -rw-r--r-- | TAO/tao/RTCORBA/RT_Service_Context_Handler.cpp | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/TAO/tao/DiffServPolicy/DiffServ_Service_Context_Handler.cpp b/TAO/tao/DiffServPolicy/DiffServ_Service_Context_Handler.cpp index 45471cedc42..2ca3a15ee3e 100644 --- a/TAO/tao/DiffServPolicy/DiffServ_Service_Context_Handler.cpp +++ b/TAO/tao/DiffServPolicy/DiffServ_Service_Context_Handler.cpp @@ -12,7 +12,7 @@ ACE_RCSID (DiffServPolicy, #include "tao/Transport.h" #include "tao/ORB_Core.h" #include "tao/GIOP_Message_Base.h" -#include "tao/Operation_Details.h" +#include "tao/operation_details.h" #include "tao/Transport_Mux_Strategy.h" #include "tao/Stub.h" @@ -41,7 +41,7 @@ TAO_DiffServ_Service_Context_Handler::generate_service_context ( TAO::NetworkPriorityPolicy_var cnp = TAO::NetworkPriorityPolicy::_narrow (cnpp.in ()); - + if (!CORBA::is_nil (cnp.in ())) { TAO::DiffservCodepoint const reply_diffserv_codepoint = @@ -59,7 +59,7 @@ TAO_DiffServ_Service_Context_Handler::generate_service_context ( opdetails.request_service_context ().set_context (IOP::REP_NWPRIORITY, cdr); } } - + return 0; } diff --git a/TAO/tao/RTCORBA/RT_Service_Context_Handler.cpp b/TAO/tao/RTCORBA/RT_Service_Context_Handler.cpp index c38cf6cb791..67c0b3e87e8 100644 --- a/TAO/tao/RTCORBA/RT_Service_Context_Handler.cpp +++ b/TAO/tao/RTCORBA/RT_Service_Context_Handler.cpp @@ -16,7 +16,7 @@ ACE_RCSID (RTCORBA, #include "tao/Transport.h" #include "tao/ORB_Core.h" #include "tao/GIOP_Message_Base.h" -#include "tao/Operation_Details.h" +#include "tao/operation_details.h" #include "tao/Transport_Mux_Strategy.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -59,7 +59,7 @@ TAO_RT_Service_Context_Handler::generate_service_context ( TAO_Protocols_Hooks *protocol_hooks = stub->orb_core ()->get_protocols_hooks (); // Get client thread priority from 'Current' or if not set by implying one // from the native thread priority via the mapping. - if (protocol_hooks && + if (protocol_hooks && (protocol_hooks->get_thread_CORBA_priority (client_priority) != -1 || protocol_hooks->get_thread_implicit_CORBA_priority (client_priority) != -1)) { |