summaryrefslogtreecommitdiff
path: root/TAO/tao/RTPortableServer
diff options
context:
space:
mode:
authorSimon McQueen <simon.mcqueen@gmail.com>2008-09-25 08:12:53 +0000
committerSimon McQueen <simon.mcqueen@gmail.com>2008-09-25 08:12:53 +0000
commitb70d6a7cc552d500543242051d9e746516ad6f4d (patch)
tree8842db9116c310bbc7c885aec743fcc89e1d4f09 /TAO/tao/RTPortableServer
parent7a9d173dcc450135ca042b8b261802eed5b386c5 (diff)
downloadATCD-b70d6a7cc552d500543242051d9e746516ad6f4d.tar.gz
ChangeLogTag: Thu Sep 25 07:47:24 UTC 2008 Simon McQueen <sm@prismtech.com>
Diffstat (limited to 'TAO/tao/RTPortableServer')
-rw-r--r--TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp
index ca055294637..0335b3fd01b 100644
--- a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp
+++ b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp
@@ -205,7 +205,7 @@ TAO_RT_Servant_Dispatcher::pre_invoke_remote_request (
throw ::CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 2,
CORBA::COMPLETED_NO);
- // Priority needs to be changed temporarily changed for the
+ // Priority needs to be temporarily changed for the
// duration of request.
if (target_priority != pre_invoke_state.original_CORBA_priority_)
{
@@ -346,8 +346,9 @@ TAO_RT_Servant_Dispatcher::post_invoke (TAO_Root_POA &poa,
if (tph != 0)
{
- if (tph->set_thread_native_priority (
- pre_invoke_state.original_native_priority_) == -1)
+ if (tph->restore_thread_CORBA_and_native_priority (
+ pre_invoke_state.original_CORBA_priority_,
+ pre_invoke_state.original_native_priority_) == -1)
throw ::CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 2,
CORBA::COMPLETED_NO);
}