diff options
Diffstat (limited to 'TAO/tests/TransportCurrent/Framework/client.cpp')
| -rw-r--r-- | TAO/tests/TransportCurrent/Framework/client.cpp | 95 |
1 files changed, 43 insertions, 52 deletions
diff --git a/TAO/tests/TransportCurrent/Framework/client.cpp b/TAO/tests/TransportCurrent/Framework/client.cpp index 12207234dd4..65be75cb715 100644 --- a/TAO/tests/TransportCurrent/Framework/client.cpp +++ b/TAO/tests/TransportCurrent/Framework/client.cpp @@ -20,8 +20,7 @@ ACE_RCSID (PICurrent, // Prototype int -test_transport_current (CORBA::ORB_ptr - ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, +test_transport_current (CORBA::ORB_ptr) ACE_THROW_SPEC ((CORBA::SystemException, CORBA::UserException)); using namespace TAO; @@ -108,7 +107,7 @@ Worker::Worker (Test::Transport::CurrentTest_ptr server, int Worker::svc (void) { - ACE_TRY_NEW_ENV + try { for (int i = 0; i < this->niterations_; ++i) @@ -124,14 +123,11 @@ Worker::svc (void) ACE_TEXT ("Client (%P|%t) Invoking server->invoked_by_client() via DII\n"))); CORBA::Request_var request = - this->server_->_request ("invoked_by_client" - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + this->server_->_request ("invoked_by_client"); request->set_return_type (CORBA::_tc_void); - request->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + request->invoke (); } #endif /* (!defined(TAO_HAS_MINIMUM_CORBA) || (TAO_HAS_MINIMUM_CORBA == 0)) */ @@ -139,20 +135,17 @@ Worker::svc (void) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Client (%P|%t) Invoking server->invoked_by_client() via SII\n"))); - this->server_->invoked_by_client (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->server_->invoked_by_client (); if (TAO_debug_level > 0 && i % 100 == 0) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Client (%P|%t) Iteration = %d\n"), i)); } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Client: exception raised"); + ex._tao_print_exception ("Client: exception raised"); } - ACE_ENDTRY; return 0; } @@ -161,31 +154,29 @@ Worker::svc (void) int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY - { - Test::Client_Request_Interceptor cri (CLIENT_ORB_ID, test_transport_current); +#if TAO_HAS_TRANSPORT_CURRENT == 1 - PortableInterceptor::ORBInitializer_ptr temp_initializer = - PortableInterceptor::ORBInitializer::_nil (); + try + { + Test::Client_Request_Interceptor* cri = 0; + ACE_NEW_RETURN (cri, + Test::Client_Request_Interceptor (CLIENT_ORB_ID, + test_transport_current), + -1); + PortableInterceptor::ClientRequestInterceptor_var cri_safe (cri); + PortableInterceptor::ORBInitializer_ptr temp_initializer = 0; ACE_NEW_RETURN (temp_initializer, - Test::Client_ORBInitializer (&cri), + Test::Client_ORBInitializer (cri), -1); + PortableInterceptor::ORBInitializer_var orb_initializer (temp_initializer); - PortableInterceptor::ORBInitializer_var orb_initializer = - temp_initializer; - - PortableInterceptor::register_orb_initializer (orb_initializer.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + PortableInterceptor::register_orb_initializer (orb_initializer.in ()); CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - CLIENT_ORB_ID - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + CLIENT_ORB_ID); if (parse_args (argc, argv) != 0) ACE_ERROR_RETURN ((LM_ERROR, @@ -194,10 +185,9 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) -1); - ACE_TRY + try { - test_transport_current (orb.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + test_transport_current (orb.in ()); ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Client (%P|%t) ERROR: ") @@ -206,22 +196,19 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_TEXT (" Expected exception was not thrown\n")), -1); } - ACE_CATCH (Transport::NoContext, ex) + catch (const Transport::NoContext& ) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Client (%P|%t) Expected exception occured when trying ") ACE_TEXT ("to access traits outside the ") ACE_TEXT ("interceptor or upcall context.\n"))); } - ACE_ENDTRY; // Resolve the target object - CORBA::Object_var obj = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + CORBA::Object_var obj = orb->string_to_object (ior); Test::Transport::CurrentTest_var server = - Test::Transport::CurrentTest::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + Test::Transport::CurrentTest::_narrow (obj.in ()); if (CORBA::is_nil (server.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -256,7 +243,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) CORBA::Long result = 0; // Verify enough interception points have been triggered - if (cri.interceptions () != 2 * // request & response + if (cri->interceptions () != 2 * // request & response niterations * // iterations nthreads * // threads (2*use_dii)) // sii and dii, if needed @@ -264,7 +251,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_ERROR ((LM_ERROR, ACE_TEXT ("Client (%P|%t) Expected %d client-side interceptions, but detected %d\n"), 2 * niterations * nthreads * (2*use_dii), - cri.interceptions ())); + cri->interceptions ())); } else { @@ -272,8 +259,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Client (%P|%t) Invoking server->self_test()\n"))); // Self-test the server side - result = server->self_test (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + result = server->self_test (); if (result != 0) ACE_ERROR ((LM_ERROR, @@ -282,22 +268,27 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Client (%P|%t) Invoking oneway server->shutdown()\n"))); - server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->shutdown (); - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Client (%P|%t) Invoking orb->destroy ()\n"))); + + orb->destroy (); ACE_DEBUG ((LM_INFO, - ACE_TEXT ("Client (%P|%t) Completed %s\n"), + ACE_TEXT ("Client (%P|%t) Completed %s.\n"), ((result == 0) ? ACE_TEXT ("successfuly") : ACE_TEXT ("with failure")))); return result; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - ACE_TEXT ("Client: Transport Current test (client-side) failed:")); + ex._tao_print_exception ( + ACE_TEXT ( + "Client: Transport Current test (client-side) failed:")); return -1; } - ACE_ENDTRY; + +#else /* TAO_HAS_TRANSPORT_CURRENT == 1 */ + ACE_DEBUG ((LM_INFO, ACE_TEXT ("Client (%P|%t) Need TAO_HAS_TRANSPORT_CURRENT enabled to run.\n"))); + return 0; +#endif /* TAO_HAS_TRANSPORT_CURRENT == 1 */ } |