diff options
Diffstat (limited to 'TAO/tests/RTCORBA/Client_Propagated/server.cpp')
| -rw-r--r-- | TAO/tests/RTCORBA/Client_Propagated/server.cpp | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/TAO/tests/RTCORBA/Client_Propagated/server.cpp b/TAO/tests/RTCORBA/Client_Propagated/server.cpp index 93054d1e483..39018db44ae 100644 --- a/TAO/tests/RTCORBA/Client_Propagated/server.cpp +++ b/TAO/tests/RTCORBA/Client_Propagated/server.cpp @@ -59,7 +59,7 @@ Test_i::test_method (CORBA::Short priority, // Print out the info. if (servant_thread_priority != priority) ACE_DEBUG ((LM_DEBUG, - "ERROR: servant thread priority is not equal " + "ERROR: servant thread priority is not equal" "to method argument.\n")); ACE_DEBUG ((LM_DEBUG, @@ -109,9 +109,7 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; - - ACE_TRY + ACE_TRY_NEW_ENV { // Standard initialization: // parse arguments and get all the references (ORB, @@ -126,16 +124,10 @@ main (int argc, char *argv[]) CORBA::Object_var object = orb->resolve_initial_references("RootPOA", ACE_TRY_ENV); ACE_TRY_CHECK; - PortableServer::POA_var root_poa = PortableServer::POA::_narrow (object.in (), ACE_TRY_ENV); ACE_TRY_CHECK; - if (CORBA::is_nil (root_poa.in ())) - ACE_ERROR_RETURN ((LM_ERROR, - "ERROR: Panic <RootPOA> is nil\n"), - -1); - PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (ACE_TRY_ENV); ACE_TRY_CHECK; @@ -221,7 +213,7 @@ main (int argc, char *argv[]) if (final_thread_priority != initial_thread_priority) ACE_DEBUG ((LM_DEBUG, - "ERROR: Priority of the servant thread " + "ERROR: Priority of the servant thread" "has been permanently changed!\n" "Initial priority: %d Final priority: %d\n", initial_thread_priority, final_thread_priority)); @@ -241,3 +233,4 @@ main (int argc, char *argv[]) return 0; } + |