diff options
Diffstat (limited to 'TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp')
| -rw-r--r-- | TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp index 9eb000f47f9..36a01002ef3 100644 --- a/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp @@ -63,7 +63,7 @@ Airplane_Server_i::init (int argc, char** argv, CORBA::Environment &ACE_TRY_ENV) { char poa_name[] = "plane"; - ACE_TRY + ACE_TRY { // Call the init of <TAO_ORB_Manager> to initialize the ORB and // create a child POA under the root POA. @@ -71,7 +71,7 @@ Airplane_Server_i::init (int argc, char** argv, CORBA::Environment &ACE_TRY_ENV) ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "init_child_poa"), -1); ACE_TRY_CHECK; - + this->argc_ = argc; this->argv_ = argv; @@ -88,14 +88,11 @@ Airplane_Server_i::init (int argc, char** argv, CORBA::Environment &ACE_TRY_ENV) ACE_TRY_ENV); ACE_TRY_CHECK; - PortableServer::POA_var child_poa = this->orb_manager_.child_poa (); - CORBA::ORB_var orb = this->orb_manager_.orb (); - if (this->use_ir_ == 1) { ACE_NEW_RETURN (this->ir_helper_, IR_Helper (poa_name, - child_poa.in (), - orb.in (), + this->orb_manager_.child_poa (), + this->orb_manager_.orb (), TAO_debug_level), -1); @@ -107,8 +104,8 @@ Airplane_Server_i::init (int argc, char** argv, CORBA::Environment &ACE_TRY_ENV) PortableServer::string_to_ObjectId ("server"); CORBA::Object_var server_obj = - child_poa->id_to_reference (id.in (), - ACE_TRY_ENV); + this->orb_manager_.child_poa ()->id_to_reference (id.in (), + ACE_TRY_ENV); ACE_TRY_CHECK; if (this->use_ir_ == 1) @@ -116,10 +113,10 @@ Airplane_Server_i::init (int argc, char** argv, CORBA::Environment &ACE_TRY_ENV) this->ir_helper_->change_object (server_obj.inout (), ACE_TRY_ENV); ACE_TRY_CHECK; } - + server_str = - orb->object_to_string (server_obj.in (), - ACE_TRY_ENV); + this->orb_manager_.orb ()->object_to_string (server_obj.in (), + ACE_TRY_ENV); ACE_TRY_CHECK; if (TAO_debug_level > 0) @@ -137,7 +134,7 @@ Airplane_Server_i::init (int argc, char** argv, CORBA::Environment &ACE_TRY_ENV) ACE_RETHROW; } ACE_ENDTRY; - + ACE_CHECK_RETURN (-1); return 0; @@ -169,7 +166,7 @@ Airplane_Server_i::run (CORBA::Environment &ACE_TRY_ENV) ACE_RETHROW; } ACE_ENDTRY; - + ACE_CHECK_RETURN (-1); return 0; |