summaryrefslogtreecommitdiff
path: root/TAO/tao/PortableServer/Object_Adapter.cpp
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2005-03-07 18:51:57 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2005-03-07 18:51:57 +0000
commita7aa3c2bfe35f400380ffd0fa8050a17170b6e27 (patch)
tree4b05a86e6dc9779c28a37cc623700c9867c26356 /TAO/tao/PortableServer/Object_Adapter.cpp
parent541e1eb74b73c3698dac9e6fb993206d36d766e1 (diff)
downloadATCD-a7aa3c2bfe35f400380ffd0fa8050a17170b6e27.tar.gz
ChangeLogTag: Mon Mar 07 18:50:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO/tao/PortableServer/Object_Adapter.cpp')
-rw-r--r--TAO/tao/PortableServer/Object_Adapter.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/TAO/tao/PortableServer/Object_Adapter.cpp b/TAO/tao/PortableServer/Object_Adapter.cpp
index cfdd59550d0..b2f82ea0bbe 100644
--- a/TAO/tao/PortableServer/Object_Adapter.cpp
+++ b/TAO/tao/PortableServer/Object_Adapter.cpp
@@ -723,7 +723,6 @@ TAO_Object_Adapter::dispatch (TAO::ObjectKey &key,
TAO_ServerRequest &request,
CORBA::Object_out forward_to
ACE_ENV_ARG_DECL)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
if (ACE_OS::memcmp (key.get_buffer (),
&TAO_Root_POA::objectkey_prefix[0],
@@ -815,7 +814,9 @@ TAO_Object_Adapter::dispatch (TAO::ObjectKey &key,
// LOCATION_FORWARD).
if (status == PortableInterceptor::SYSTEM_EXCEPTION
|| status == PortableInterceptor::USER_EXCEPTION)
- ACE_RE_THROW;
+ {
+ ACE_RE_THROW;
+ }
}
ACE_ENDTRY;
ACE_CHECK_RETURN (result);