diff options
| author | elliott_c <elliott_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2007-01-25 18:17:52 +0000 |
|---|---|---|
| committer | elliott_c <elliott_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2007-01-25 18:17:52 +0000 |
| commit | 2ee7b7eed4c0cc10f4ec25b186b04202af01b565 (patch) | |
| tree | 08a8a649c90559cf5b2228c1caad15515902613e /TAO/tests/Bug_1495_Regression/server_interceptor.cpp | |
| parent | c979767a00db4ea1299af482033a68829cc16675 (diff) | |
| download | ATCD-2ee7b7eed4c0cc10f4ec25b186b04202af01b565.tar.gz | |
ChangeLogTag: Thu Jan 25 17:39:59 UTC 2007 Chad Elliott <elliott_c@ociweb.com>
Diffstat (limited to 'TAO/tests/Bug_1495_Regression/server_interceptor.cpp')
| -rw-r--r-- | TAO/tests/Bug_1495_Regression/server_interceptor.cpp | 32 |
1 files changed, 13 insertions, 19 deletions
diff --git a/TAO/tests/Bug_1495_Regression/server_interceptor.cpp b/TAO/tests/Bug_1495_Regression/server_interceptor.cpp index 545156c3359..7767288eba5 100644 --- a/TAO/tests/Bug_1495_Regression/server_interceptor.cpp +++ b/TAO/tests/Bug_1495_Regression/server_interceptor.cpp @@ -29,16 +29,15 @@ Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor (void) } void -Echo_Server_Request_Interceptor::forward_reference (CORBA::Object_ptr forward_location - ACE_ENV_ARG_DECL) +Echo_Server_Request_Interceptor::forward_reference (CORBA::Object_ptr forward_location) ACE_THROW_SPEC ((CORBA::SystemException)) { if (CORBA::is_nil (forward_location)) - ACE_THROW (CORBA::INV_OBJREF ( - CORBA::SystemException::_tao_minor_code ( - TAO::VMCID, - EINVAL), - CORBA::COMPLETED_NO)); + throw CORBA::INV_OBJREF ( + CORBA::SystemException::_tao_minor_code ( + TAO::VMCID, + EINVAL), + CORBA::COMPLETED_NO); this->forward_location_ = CORBA::Object::_duplicate (forward_location); } @@ -57,8 +56,7 @@ Echo_Server_Request_Interceptor::destroy (void) void Echo_Server_Request_Interceptor::receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -83,15 +81,14 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts ( ACE_DEBUG ((LM_DEBUG, "Sending LOCATION_FORWARD, current thread %i\n", ACE_Thread::self ())); - ACE_THROW (PortableInterceptor::ForwardRequest (this->forward_location_)); + throw PortableInterceptor::ForwardRequest (this->forward_location_); } void Echo_Server_Request_Interceptor::receive_request ( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -100,8 +97,7 @@ Echo_Server_Request_Interceptor::receive_request ( void Echo_Server_Request_Interceptor::send_reply ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)) { // No op @@ -110,8 +106,7 @@ Echo_Server_Request_Interceptor::send_reply ( void Echo_Server_Request_Interceptor::send_exception ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -121,8 +116,7 @@ Echo_Server_Request_Interceptor::send_exception ( void Echo_Server_Request_Interceptor::send_other ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -133,7 +127,7 @@ Echo_Server_Request_Interceptor::send_other ( CORBA::Object_var forward = ri->forward_reference (); if (CORBA::is_nil (forward.in ())) - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } bool |