diff options
Diffstat (limited to 'TAO/tests/Portable_Interceptors/Dynamic/server.cpp')
| -rw-r--r-- | TAO/tests/Portable_Interceptors/Dynamic/server.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/server.cpp b/TAO/tests/Portable_Interceptors/Dynamic/server.cpp index 9a781a28a81..7ac5b662972 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/server.cpp +++ b/TAO/tests/Portable_Interceptors/Dynamic/server.cpp @@ -5,7 +5,9 @@ #include "interceptors.h" #include "Echo_Server_ORBInitializer.h" -ACE_RCSID(Dynamic, server, "$Id$") +ACE_RCSID (Dynamic, + server, + "$Id$") const char *ior_output_file = 0; @@ -39,7 +41,6 @@ main (int argc, char *argv[]) { ACE_TRY_NEW_ENV { -#if TAO_HAS_INTERCEPTORS == 1 PortableInterceptor::ORBInitializer_ptr temp_initializer = PortableInterceptor::ORBInitializer::_nil (); @@ -53,16 +54,14 @@ main (int argc, char *argv[]) ACE_TRY_ENV); ACE_TRY_CHECK; - /// Transfer ownership to the ORB. - (void) orb_initializer._retn (); -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references ("RootPOA"); + orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV); + ACE_TRY_CHECK; + if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, " (%P|%t) Unable to initialize the POA.\n"), @@ -87,12 +86,12 @@ main (int argc, char *argv[]) PortableServer::ObjectId_var id = root_poa->activate_object (&server_impl, ACE_TRY_ENV); - ACE_CHECK_RETURN (0); + ACE_TRY_CHECK; CORBA::Object_var test_obj = root_poa->id_to_reference (id.in (), ACE_TRY_ENV); - ACE_CHECK_RETURN (0); + ACE_TRY_CHECK; Test_Interceptors::Visual_var server = Test_Interceptors::Visual::_narrow (test_obj.in (), @@ -118,8 +117,9 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - if (orb->run () == -1) - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "orb->run"), -1); + orb->run (ACE_TRY_ENV); + ACE_TRY_CHECK; + ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); root_poa->destroy (1, 1, ACE_TRY_ENV); |