From 1ce4bfe566cacc77785f53a0133d4c40f1d4146b Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Wed, 24 Jan 2007 13:42:44 +0000 Subject: Wed Jan 24 12:25:12 UTC 2007 Johnny Willemsen --- .../Direct_Collocation_Upcall_Wrapper.cpp | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) (limited to 'TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp') diff --git a/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp b/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp index d7ce947dbae..e13c20b8f7f 100644 --- a/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp +++ b/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp @@ -26,10 +26,8 @@ TAO::Direct_Collocation_Upcall_Wrapper::upcall ( int num_args, const char * op, size_t op_len, - TAO::Collocation_Strategy strategy - ACE_ENV_ARG_DECL -) -ACE_THROW_SPEC ((CORBA::Exception)) + TAO::Collocation_Strategy strategy) + ACE_THROW_SPEC ((CORBA::Exception)) { TAO_Abstract_ServantBase * const servant = obj->_servant (); @@ -41,33 +39,29 @@ ACE_THROW_SPEC ((CORBA::Exception)) if (status == -1) { - ACE_THROW (CORBA::BAD_OPERATION (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO)); + throw ( ::CORBA::BAD_OPERATION (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO)); } - ACE_TRY + try { collocated_skel (servant, args, - num_args - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + num_args); } #if (TAO_HAS_MINIMUM_CORBA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) - ACE_CATCH (PortableServer::ForwardRequest, forward_request) + catch ( ::PortableServer::ForwardRequest& forward_request) { forward_obj = CORBA::Object::_duplicate (forward_request.forward_reference.in ()); return; } #else - ACE_CATCHANY + catch ( ::CORBA::Exception& ex) { ACE_UNUSED_ARG (forward_obj); - ACE_RE_THROW; + throw; } #endif /* TAO_HAS_MINIMUM_CORBA && !CORBA_E_COMPACT && !CORBA_E_MICRO*/ - ACE_ENDTRY; - ACE_CHECK; } TAO_END_VERSIONED_NAMESPACE_DECL -- cgit v1.2.1