diff options
Diffstat (limited to 'TAO/examples/Simple/Simple_util.cpp')
| -rw-r--r-- | TAO/examples/Simple/Simple_util.cpp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/TAO/examples/Simple/Simple_util.cpp b/TAO/examples/Simple/Simple_util.cpp index 92fb6658ca1..4cb71221113 100644 --- a/TAO/examples/Simple/Simple_util.cpp +++ b/TAO/examples/Simple/Simple_util.cpp @@ -178,7 +178,7 @@ Server<Servant>::init (const char *servant_name, } ACE_CATCHANY { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"\tException in activation of POA"); + ACE_TRY_ENV.print_exception ("\tException in activation of POA"); return -1; } ACE_ENDTRY; @@ -220,9 +220,6 @@ Server<Servant>::register_name (void) CORBA::Object_var object = servant_._this (ACE_TRY_ENV); ACE_TRY_CHECK; - this->orb_manager_.activate_poa_manager (ACE_TRY_ENV); - ACE_TRY_CHECK; - naming_server_->rebind (bindName, object.in(), ACE_TRY_ENV); @@ -237,13 +234,13 @@ Server<Servant>::register_name (void) } ACE_CATCH (CosNaming::NamingContext::AlreadyBound, ex) { + ACE_TRY_ENV.clear (); ACE_ERROR_RETURN ((LM_ERROR, "Unable to bind %s \n", name), -1); } ACE_ENDTRY; - ACE_CHECK_RETURN (-1); return 0; } @@ -404,7 +401,7 @@ Client<INTERFACE_OBJECT, Var>::init (const char *name, } ACE_CATCHANY { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Client_i::init"); + ACE_TRY_ENV.print_exception ("Client_i::init"); return -1; } ACE_ENDTRY; @@ -427,11 +424,11 @@ Client<INTERFACE_OBJECT, Var>::obtain_initial_references (CORBA::Environment &AC "the TAO_Naming_Client. \n"), -1); - CosNaming::Name server_name (1); server_name.length (1); server_name[0].id = CORBA::string_dup (this->name_); + CORBA::Object_var obj = naming_client_->resolve (server_name, ACE_TRY_ENV); @@ -443,7 +440,7 @@ Client<INTERFACE_OBJECT, Var>::obtain_initial_references (CORBA::Environment &AC } ACE_CATCHANY { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Client::obtain_initial_references"); + ACE_TRY_ENV.print_exception ("Client::obtain_initial_references"); return -1; } ACE_ENDTRY; |