diff options
Diffstat (limited to 'TAO/tests/Portable_Interceptors/Bug_2510_Regression')
10 files changed, 29 insertions, 67 deletions
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.cpp index acceb91568b..5d8a1d77a55 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.cpp @@ -35,14 +35,12 @@ Client_ORBInitializer::post_init ( ACE_NEW_THROW_EX (interceptor, Echo_Client_Request_Interceptor (), CORBA::NO_MEMORY ()); - ACE_CHECK; PortableInterceptor::ClientRequestInterceptor_var client_interceptor = interceptor; info->add_client_request_interceptor (client_interceptor.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_UNUSED_ARG (slot_id); } diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.cpp index db5aab77b1d..87b8b09a27f 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.cpp @@ -36,14 +36,12 @@ Server_ORBInitializer::post_init ( ACE_NEW_THROW_EX (this->server_interceptor_, Echo_Server_Request_Interceptor, CORBA::NO_MEMORY ()); - ACE_CHECK; PortableInterceptor::ServerRequestInterceptor_var interceptor = this->server_interceptor_; info->add_server_request_interceptor (interceptor.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } Echo_Server_Request_Interceptor * diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client.cpp index b95896c27ad..cd8cbf79b2e 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client.cpp @@ -43,15 +43,13 @@ static ACE_THR_FUNC_RETURN run_test(void* pData) ACE_TRY { server->normal (10 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { ACE_PRINT_EXCEPTION (ex, "Exception thrown in run_test()\n"); } ACE_ENDTRY; - ACE_CHECK; - + return (ACE_THR_FUNC_RETURN)0; } @@ -70,22 +68,18 @@ main (int argc, char *argv[]) PortableInterceptor::register_orb_initializer (initializer.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test_Interceptors::Visual_var server = Test_Interceptors::Visual::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) { @@ -97,7 +91,7 @@ main (int argc, char *argv[]) ACE_hthread_t threadHandle; if ( ACE_Thread::spawn( run_test, - static_cast<void*>(server.in()), + static_cast<void*>(server.in()), THR_NEW_LWP | THR_JOINABLE , 0, & threadHandle @@ -107,10 +101,8 @@ main (int argc, char *argv[]) } ACE_Thread::join (threadHandle); - ACE_TRY_CHECK; - server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->shutdown (); } ACE_CATCHANY @@ -119,7 +111,7 @@ main (int argc, char *argv[]) "Caught exception in client:"); return 1; } - + ACE_ENDTRY; return 0; diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.cpp index b4f1e4e37cb..a1e13028d77 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.cpp @@ -24,14 +24,14 @@ Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor (void) } char * -Echo_Client_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Client_Request_Interceptor::name (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); } void -Echo_Client_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Client_Request_Interceptor::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -53,12 +53,10 @@ Echo_Client_Request_Interceptor::send_request ( PortableInterceptor::ForwardRequest)) { CORBA::String_var operation = - ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->operation (); CORBA::Object_var target = - ri->target (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->target (); ACE_DEBUG ((LM_DEBUG,"%s.send_request from %s\n", this->myname_, operation.in ())); @@ -74,7 +72,6 @@ Echo_Client_Request_Interceptor::send_request ( // Add this context to the service context list. ri->add_request_service_context (sc, 0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void @@ -84,12 +81,10 @@ Echo_Client_Request_Interceptor::receive_reply ( ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::String_var operation = - ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->operation (); CORBA::Object_var target = - ri->target (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->target (); ACE_DEBUG ((LM_DEBUG,"%s.receive_reply from %s\n", this->myname_, operation.in ())); } @@ -101,11 +96,9 @@ Echo_Client_Request_Interceptor::receive_other ( ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { - CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var operation = ri->operation (); - CORBA::Object_var target = ri->target (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::Object_var target = ri->target (); ACE_DEBUG ((LM_DEBUG,"%s.receive_other from %s\n", this->myname_, operation.in ())); } @@ -117,11 +110,9 @@ Echo_Client_Request_Interceptor::receive_exception ( ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { - CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var operation = ri->operation (); - CORBA::Object_var target = ri->target (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::Object_var target = ri->target (); ACE_DEBUG ((LM_DEBUG,"%s.receive_exception from %s\n", this->myname_, operation.in ())); } diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.h b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.h index 95c3e21346f..d1a4ed1b491 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.h +++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.h @@ -31,11 +31,11 @@ public: virtual ~Echo_Client_Request_Interceptor (); // dtor. - virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (void) ACE_THROW_SPEC ((CORBA::SystemException)); // Canonical name of the interceptor. - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server.cpp index 74e0c0a7227..93ebd9098d9 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server.cpp @@ -55,11 +55,9 @@ main (int argc, char *argv[]) // Now create an ORB CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -68,14 +66,11 @@ main (int argc, char *argv[]) PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); if (parse_args (argc, argv) != 0) return 1; @@ -85,21 +80,17 @@ main (int argc, char *argv[]) PortableServer::ObjectId_var id = root_poa->activate_object (&server_impl ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var test_obj = root_poa->id_to_reference (id.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test_Interceptors::Visual_var server = Test_Interceptors::Visual::_narrow (test_obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::String_var ior = orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Test_Interceptors::Visual: <%s>\n", @@ -118,13 +109,11 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.cpp index 60b8e2eb1d2..1edf05d2a24 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.cpp @@ -20,14 +20,14 @@ Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor (void) } char * -Echo_Server_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Server_Request_Interceptor::name (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); } void -Echo_Server_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Server_Request_Interceptor::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -40,8 +40,7 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts ( PortableInterceptor::ForwardRequest)) { - CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var operation = ri->operation (); ACE_DEBUG ((LM_DEBUG, "%s.receive_request_service_contexts from " @@ -57,7 +56,6 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts ( IOP::ServiceId id = ::service_id; IOP::ServiceContext_var sc = ri->get_request_service_context (id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; const char *buf = reinterpret_cast<const char *> (sc->context_data.get_buffer ()); @@ -82,7 +80,6 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts ( { ri->set_slot (slotId, data); ACE_DEBUG ((LM_DEBUG, "receive_request_service_contexts filled Slot %d\n",(int)slotId)); - ACE_TRY_CHECK; } ACE_CATCHANY { @@ -90,7 +87,6 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts ( ACE_TRY_THROW (CORBA::INTERNAL ()); } ACE_ENDTRY; - ACE_CHECK; } } diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.h b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.h index f6af5ee88c2..938dfc12486 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.h +++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.h @@ -31,11 +31,11 @@ public: ~Echo_Server_Request_Interceptor (); // dotr. - virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (void) ACE_THROW_SPEC ((CORBA::SystemException)); // Canonical name of the interceptor. - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.cpp index 2686a6bfa70..1dd810a18be 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.cpp @@ -26,8 +26,8 @@ Visual_i::normal (CORBA::Long arg CORBA::Object_var piobj = orb_->resolve_initial_references ("PICurrent"); PortableInterceptor::Current_var pi_current = PortableInterceptor::Current::_narrow (piobj.in () ); - - if (CORBA::is_nil (pi_current.in ())) + + if (CORBA::is_nil (pi_current.in ())) { ACE_DEBUG ((LM_DEBUG, "Visual_i::normal : Unable to obtain PICurrent reference\n")); throw CORBA::INTERNAL(); @@ -44,10 +44,9 @@ Visual_i::normal (CORBA::Long arg throw; } ACE_ENDTRY; - ACE_CHECK; const char *str = 0; - if (! (retrieved_any.in() >>= str) ) + if (! (retrieved_any.in() >>= str) ) { ACE_DEBUG ((LM_DEBUG, "Visual_i::normal : Problem extracting data from CORBA::Any\n")); throw CORBA::INTERNAL(); @@ -59,9 +58,8 @@ Visual_i::normal (CORBA::Long arg } void -Visual_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Visual_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.h b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.h index bda46fa2346..14457ef6443 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.h +++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.h @@ -31,7 +31,7 @@ public: void normal (CORBA::Long arg ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: |