diff options
Diffstat (limited to 'TAO/tests/NestedUpcall/Reactor/mt_client.cpp')
| -rw-r--r-- | TAO/tests/NestedUpcall/Reactor/mt_client.cpp | 26 |
1 files changed, 5 insertions, 21 deletions
diff --git a/TAO/tests/NestedUpcall/Reactor/mt_client.cpp b/TAO/tests/NestedUpcall/Reactor/mt_client.cpp index 9b6b398082d..85dd43bc314 100644 --- a/TAO/tests/NestedUpcall/Reactor/mt_client.cpp +++ b/TAO/tests/NestedUpcall/Reactor/mt_client.cpp @@ -12,24 +12,19 @@ NestedUpCalls_MT_Client::NestedUpCalls_MT_Client (void) : nested_up_calls_reactor_key_ ("file://test.ior"), shutdown_ (0), call_count_ (5), - nthreads_ (4), - quiet_ (0) + nthreads_ (4) { } int NestedUpCalls_MT_Client::parse_args (int argc, char* argv[]) { - ACE_Get_Opt get_opts (argc, argv, "qdxn:t:k:"); + ACE_Get_Opt get_opts (argc, argv, "dxn:t:k:"); int c; while ((c = get_opts ()) != -1) switch (c) { - case 'q': - this->quiet_ = 1; - break; - case 'd': // debug flag TAO_debug_level++; break; @@ -102,11 +97,11 @@ NestedUpCalls_MT_Client::svc (void) { ACE_TRY_NEW_ENV { - ACE_DEBUG ((LM_DEBUG, "Running thread (%t) %d\n", this->quiet_)); + ACE_DEBUG ((LM_DEBUG, "Running thread (%t)\n")); // Create an EventHandler servant to hand to the other side... - EventHandler_i eh_impl (this->quiet_); - EventHandler_var eh = eh_impl._this (ACE_TRY_ENV); + auto_ptr<EventHandler_i> eh_impl (new EventHandler_i); + EventHandler_var eh = eh_impl->_this (ACE_TRY_ENV); ACE_TRY_CHECK; // Now, we can invoke an operation on the remote side. @@ -126,17 +121,6 @@ NestedUpCalls_MT_Client::svc (void) this->call_count_, ACE_TRY_ENV); ACE_TRY_CHECK; - - PortableServer::POA_var poa = - eh_impl._default_POA (ACE_TRY_ENV); - ACE_TRY_CHECK; - - PortableServer::ObjectId_var oid = - poa->servant_to_id (&eh_impl, ACE_TRY_ENV); - ACE_TRY_CHECK; - - poa->deactivate_object (oid.in (), ACE_TRY_ENV); - ACE_TRY_CHECK; } ACE_CATCHANY { |