summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2007-01-27 06:11:08 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2007-01-27 06:11:08 +0000
commitde63b27cadcc9d16aeac69f196d96f95c3d19e36 (patch)
treef24d65b5fbd6175131eb5f9036607520ecea14e5
parent9b9521b43e968205fff2cdb77308de9766cd8f7a (diff)
downloadATCD-de63b27cadcc9d16aeac69f196d96f95c3d19e36.tar.gz
Sat Jan 27 06:05:12 UTC 2007 Johnny Willemsen <jwillmesen@remedy.nl>
-rw-r--r--TAO/tao/Collocated_Invocation.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/TAO/tao/Collocated_Invocation.cpp b/TAO/tao/Collocated_Invocation.cpp
index a00bbe9afed..167ad10b647 100644
--- a/TAO/tao/Collocated_Invocation.cpp
+++ b/TAO/tao/Collocated_Invocation.cpp
@@ -114,7 +114,7 @@ namespace TAO
return s;
#endif /*TAO_HAS_INTERCEPTORS */
}
- catch ( ::CORBA::Exception& ex)
+ catch (const ::CORBA::Exception& ex)
{
// Ignore exceptions for oneways
if (this->response_expected_ == false)
@@ -122,13 +122,14 @@ namespace TAO
#if TAO_HAS_INTERCEPTORS == 1
PortableInterceptor::ReplyStatus const status =
- this->handle_any_exception (&ex
- );
+ this->handle_any_exception (&ex);
if (status == PortableInterceptor::LOCATION_FORWARD ||
status == PortableInterceptor::TRANSPORT_RETRY)
s = TAO_INVOKE_RESTART;
else
+#else
+ ACE_UNUSED_ARG (ex);
#endif /*TAO_HAS_INTERCEPTORS*/
throw;
}