diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-03-17 10:37:15 +0100 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-03-17 10:37:15 +0100 |
| commit | fe0a8e3c6c8bf1d10a71d1eee6a956c3560bd562 (patch) | |
| tree | 814922c24616e5db888b750a0ff692f2ce8368a8 /TAO | |
| parent | 5a0dbea7c881e97c5419d8584a45ed43d07ab8e9 (diff) | |
| download | ATCD-fe0a8e3c6c8bf1d10a71d1eee6a956c3560bd562.tar.gz | |
bool changes
Diffstat (limited to 'TAO')
371 files changed, 407 insertions, 463 deletions
diff --git a/TAO/docs/tutorials/Quoter/AMI/client.cpp b/TAO/docs/tutorials/Quoter/AMI/client.cpp index 0aa4ff85106..dcab40e0780 100644 --- a/TAO/docs/tutorials/Quoter/AMI/client.cpp +++ b/TAO/docs/tutorials/Quoter/AMI/client.cpp @@ -71,7 +71,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) } // Destroy the POA, waiting until the destruction terminates - poa->destroy (1, 1); + poa->destroy (true, true); orb->destroy (); } catch (const CORBA::Exception &) { diff --git a/TAO/docs/tutorials/Quoter/AMI/server.cpp b/TAO/docs/tutorials/Quoter/AMI/server.cpp index a751be49f3e..706b523ac2c 100644 --- a/TAO/docs/tutorials/Quoter/AMI/server.cpp +++ b/TAO/docs/tutorials/Quoter/AMI/server.cpp @@ -32,7 +32,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) orb->run (); // Destroy the POA, waiting until the destruction terminates - poa->destroy (1, 1); + poa->destroy (true, true); orb->destroy (); } catch (const CORBA::Exception &) { diff --git a/TAO/docs/tutorials/Quoter/Event_Service/client.cpp b/TAO/docs/tutorials/Quoter/Event_Service/client.cpp index 747b8b9a03f..858ac20a3f5 100644 --- a/TAO/docs/tutorials/Quoter/Event_Service/client.cpp +++ b/TAO/docs/tutorials/Quoter/Event_Service/client.cpp @@ -40,7 +40,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) stock_consumer_i.disconnect (); - poa->destroy (1, 1); + poa->destroy (true, true); orb->destroy (); } catch (const CORBA::Exception &) { diff --git a/TAO/docs/tutorials/Quoter/Event_Service/server.cpp b/TAO/docs/tutorials/Quoter/Event_Service/server.cpp index 686dce55dba..37642b63661 100644 --- a/TAO/docs/tutorials/Quoter/Event_Service/server.cpp +++ b/TAO/docs/tutorials/Quoter/Event_Service/server.cpp @@ -90,7 +90,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) stock_factory_i.destroy_stock_objects (); // Destroy the POA, waiting until the destruction terminates - poa->destroy (1, 1); + poa->destroy (true, true); orb->destroy (); } catch (const CORBA::Exception &) { diff --git a/TAO/docs/tutorials/Quoter/Naming_Service/server.cpp b/TAO/docs/tutorials/Quoter/Naming_Service/server.cpp index baab5b10738..bfd7e5c964a 100644 --- a/TAO/docs/tutorials/Quoter/Naming_Service/server.cpp +++ b/TAO/docs/tutorials/Quoter/Naming_Service/server.cpp @@ -41,7 +41,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) orb->run (); // Destroy the POA, waiting until the destruction terminates - poa->destroy (1, 1); + poa->destroy (true, true); orb->destroy (); } catch (const CORBA::Exception &) { diff --git a/TAO/docs/tutorials/Quoter/On_Demand_Activation/client.cpp b/TAO/docs/tutorials/Quoter/On_Demand_Activation/client.cpp index 0aa4ff85106..dcab40e0780 100644 --- a/TAO/docs/tutorials/Quoter/On_Demand_Activation/client.cpp +++ b/TAO/docs/tutorials/Quoter/On_Demand_Activation/client.cpp @@ -71,7 +71,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) } // Destroy the POA, waiting until the destruction terminates - poa->destroy (1, 1); + poa->destroy (true, true); orb->destroy (); } catch (const CORBA::Exception &) { diff --git a/TAO/docs/tutorials/Quoter/On_Demand_Activation/server.cpp b/TAO/docs/tutorials/Quoter/On_Demand_Activation/server.cpp index 09f2f8bb23d..18a59e1b81d 100644 --- a/TAO/docs/tutorials/Quoter/On_Demand_Activation/server.cpp +++ b/TAO/docs/tutorials/Quoter/On_Demand_Activation/server.cpp @@ -65,7 +65,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) orb->run (); // Destroy the POA, waiting until the destruction terminates - poa->destroy (1, 1); + poa->destroy (true, true); orb->destroy (); } catch (const CORBA::Exception &) { diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/Broker.cpp b/TAO/docs/tutorials/Quoter/RTCORBA/Broker.cpp index 8a3dbc053f8..8c1b17ee70e 100644 --- a/TAO/docs/tutorials/Quoter/RTCORBA/Broker.cpp +++ b/TAO/docs/tutorials/Quoter/RTCORBA/Broker.cpp @@ -198,7 +198,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) orb->run (); // Cleanup the POA and ORB. - poa->destroy (1, 1); + poa->destroy (true, true); orb->destroy (); } catch (const CORBA::Exception &ex) diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/Distributor.cpp b/TAO/docs/tutorials/Quoter/RTCORBA/Distributor.cpp index a6c5d8b6b96..b323f8f2a5c 100644 --- a/TAO/docs/tutorials/Quoter/RTCORBA/Distributor.cpp +++ b/TAO/docs/tutorials/Quoter/RTCORBA/Distributor.cpp @@ -164,7 +164,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) orb->run (); // Cleanup the POA and ORB. - poa->destroy (1, 1); + poa->destroy (true, true); orb->destroy (); } catch (const CORBA::Exception &ex) diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/client.cpp b/TAO/docs/tutorials/Quoter/RT_Event_Service/client.cpp index 5b5f49fcd93..87207772bf9 100644 --- a/TAO/docs/tutorials/Quoter/RT_Event_Service/client.cpp +++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/client.cpp @@ -59,7 +59,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) stock_consumer_i.disconnect (); - poa->destroy (1, 1); + poa->destroy (true, true); orb->destroy (); } catch (const CORBA::Exception &ex) { diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/server.cpp b/TAO/docs/tutorials/Quoter/RT_Event_Service/server.cpp index d6844c4186d..331ec2bbfdd 100644 --- a/TAO/docs/tutorials/Quoter/RT_Event_Service/server.cpp +++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/server.cpp @@ -90,7 +90,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) stock_factory_i.destroy_stock_objects (); // Destroy the POA, waiting until the destruction terminates - poa->destroy (1, 1); + poa->destroy (true, true); orb->destroy (); } catch (const CORBA::Exception &) { diff --git a/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/server.cpp b/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/server.cpp index 7744f30a7f6..590e83f26a5 100644 --- a/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/server.cpp +++ b/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/server.cpp @@ -94,7 +94,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) orb->run (); // Destroy POA, waiting until the destruction terminates. - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } catch (const CORBA::Exception &) { diff --git a/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/server.cpp b/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/server.cpp index a2c32f89e4e..fa23e90490c 100644 --- a/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/server.cpp +++ b/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/server.cpp @@ -71,7 +71,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) orb->run (); // Destroy the POA, waiting until the destruction terminates - poa->destroy (1, 1); + poa->destroy (true, true); orb->destroy (); } catch (const CORBA::Exception &) { diff --git a/TAO/docs/tutorials/Quoter/Simple/Persistent/server.cpp b/TAO/docs/tutorials/Quoter/Simple/Persistent/server.cpp index 7f0166b5037..84f390bf6a5 100644 --- a/TAO/docs/tutorials/Quoter/Simple/Persistent/server.cpp +++ b/TAO/docs/tutorials/Quoter/Simple/Persistent/server.cpp @@ -85,7 +85,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) orb-> run (); // Destroy POA, waiting until the destruction terminates. - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } catch (const CORBA::Exception &) { diff --git a/TAO/docs/tutorials/Quoter/Simple/Server/index.html b/TAO/docs/tutorials/Quoter/Simple/Server/index.html index 7f7c2bc31cf..2d1193b768c 100644 --- a/TAO/docs/tutorials/Quoter/Simple/Server/index.html +++ b/TAO/docs/tutorials/Quoter/Simple/Server/index.html @@ -259,7 +259,7 @@ int main (int argc, char* argv[]) // The application code goes here! // Destroy the POA, waiting until the destruction terminates - poa->destroy (1, 1); + poa->destroy (true, true); orb->destroy (); } catch (const CORBA::Exception &ex) { diff --git a/TAO/docs/tutorials/Quoter/Simple/Server/server.cpp b/TAO/docs/tutorials/Quoter/Simple/Server/server.cpp index 9fa80224011..743b9161fc5 100644 --- a/TAO/docs/tutorials/Quoter/Simple/Server/server.cpp +++ b/TAO/docs/tutorials/Quoter/Simple/Server/server.cpp @@ -31,7 +31,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) orb->run (); // Destroy the POA, waiting until the destruction terminates - poa->destroy (1, 1); + poa->destroy (true, true); orb->destroy (); } catch (const CORBA::Exception &) { diff --git a/TAO/examples/Buffered_AMI/client.cpp b/TAO/examples/Buffered_AMI/client.cpp index b58a7483565..a0bcf15bbe1 100644 --- a/TAO/examples/Buffered_AMI/client.cpp +++ b/TAO/examples/Buffered_AMI/client.cpp @@ -310,8 +310,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) test_object->shutdown (); } - root_poa->destroy (1, - 1); + root_poa->destroy (1, 1); // Destroy the ORB. On some platforms, e.g., Win32, the socket // library is closed at the end of main(). This means that any diff --git a/TAO/examples/Buffered_AMI/server.cpp b/TAO/examples/Buffered_AMI/server.cpp index dc71e7223d6..1f4f6cc1812 100644 --- a/TAO/examples/Buffered_AMI/server.cpp +++ b/TAO/examples/Buffered_AMI/server.cpp @@ -75,8 +75,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - root_poa->destroy (1, - 1); + root_poa->destroy (1, 1); } catch (const CORBA::Exception& ex) { diff --git a/TAO/examples/Buffered_Oneways/server.cpp b/TAO/examples/Buffered_Oneways/server.cpp index 87d910c12b9..eb7d89b8bf6 100644 --- a/TAO/examples/Buffered_Oneways/server.cpp +++ b/TAO/examples/Buffered_Oneways/server.cpp @@ -77,8 +77,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - root_poa->destroy (1, - 1); + root_poa->destroy (1, 1); } catch (const CORBA::Exception& ex) { diff --git a/TAO/examples/PluggableUDP/tests/Performance/client.cpp b/TAO/examples/PluggableUDP/tests/Performance/client.cpp index eb6e6a10137..b16acb89b2d 100644 --- a/TAO/examples/PluggableUDP/tests/Performance/client.cpp +++ b/TAO/examples/PluggableUDP/tests/Performance/client.cpp @@ -126,8 +126,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) client->wait (); - root_poa->destroy (1, // ethernalize objects - 0); // wait for completion + root_poa->destroy (true, // ethernalize objects + false); // wait for completion orb->destroy (); diff --git a/TAO/examples/PluggableUDP/tests/Performance/server.cpp b/TAO/examples/PluggableUDP/tests/Performance/server.cpp index 91741c7b2b2..379e624c0af 100644 --- a/TAO/examples/PluggableUDP/tests/Performance/server.cpp +++ b/TAO/examples/PluggableUDP/tests/Performance/server.cpp @@ -162,8 +162,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "ORB finished\n")); - root_poa->destroy (1, // ethernalize objects - 0); // wait for completion + root_poa->destroy (true, // ethernalize objects + false); // wait for completion orb->destroy (); diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/server.cpp b/TAO/examples/PluggableUDP/tests/SimplePerformance/server.cpp index 3a34e3f3f4f..06757f4f51a 100644 --- a/TAO/examples/PluggableUDP/tests/SimplePerformance/server.cpp +++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/server.cpp @@ -106,7 +106,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp b/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp index 78bb5182a80..e4b152568c0 100644 --- a/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp +++ b/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp @@ -331,8 +331,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) delete demo_consumer; - root_poa->destroy (1, - 1); + root_poa->destroy (1, 1); } catch (const CORBA::Exception& ex) diff --git a/TAO/examples/ior_corbaloc/server.cpp b/TAO/examples/ior_corbaloc/server.cpp index c1eb257d44d..db50409477a 100644 --- a/TAO/examples/ior_corbaloc/server.cpp +++ b/TAO/examples/ior_corbaloc/server.cpp @@ -63,7 +63,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) orb->run (); // Destroy the POA, waiting until the destruction terminates - poa->destroy (1, 1); + poa->destroy (true, true); orb->destroy (); } catch (const CORBA::SystemException& ex){ diff --git a/TAO/interop-tests/CdrOutArg/orbix/server.cxx b/TAO/interop-tests/CdrOutArg/orbix/server.cxx index 4b32d59babb..7a65feca508 100644 --- a/TAO/interop-tests/CdrOutArg/orbix/server.cxx +++ b/TAO/interop-tests/CdrOutArg/orbix/server.cxx @@ -67,7 +67,7 @@ main(int argc, char* argv[]) printf("event loop finished\n"); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/interop-tests/CdrOutArg/tao/server.cpp b/TAO/interop-tests/CdrOutArg/tao/server.cpp index cea32828b0f..cb33129bca9 100644 --- a/TAO/interop-tests/CdrOutArg/tao/server.cpp +++ b/TAO/interop-tests/CdrOutArg/tao/server.cpp @@ -105,7 +105,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/MessengerServer.cpp index 9a8642a0587..4358936462e 100644 --- a/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/MessengerServer.cpp +++ b/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/MessengerServer.cpp @@ -78,7 +78,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) std::cout << "IOR written to file " << ACE_TEXT_ALWAYS_CHAR(ior_output_file) << std::endl; orb->run(); - poa->destroy (1, 1); + poa->destroy (true, true); orb->destroy (); std::cout << "Messenger Server is shut down!" diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/server.cpp b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/server.cpp index 5e131ebbd65..f96b1eda01e 100644 --- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/server.cpp +++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/server.cpp @@ -107,7 +107,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // Run the ORB event loop. orb->run (); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); diff --git a/TAO/orbsvcs/examples/LoadBalancing/server.cpp b/TAO/orbsvcs/examples/LoadBalancing/server.cpp index 49c00ddf9f2..c3f0c42fcd8 100644 --- a/TAO/orbsvcs/examples/LoadBalancing/server.cpp +++ b/TAO/orbsvcs/examples/LoadBalancing/server.cpp @@ -299,7 +299,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp b/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp index 3028d6a29d8..cb9cfc040ca 100644 --- a/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp +++ b/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp @@ -290,7 +290,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // Now we can destroy the POA, the flags mean that we want to // wait until the POA is really destroyed - poa->destroy (1, 1); + poa->destroy (true, true); // Finally destroy the ORB orb->destroy (); diff --git a/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp b/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp index a644b0db7cb..07c950987ef 100644 --- a/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp +++ b/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp @@ -48,7 +48,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // Start the ORB orb->run (); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); } catch (const CORBA::SytemException& ) diff --git a/TAO/orbsvcs/examples/Security/Send_File/server.cpp b/TAO/orbsvcs/examples/Security/Send_File/server.cpp index 0a1794867fe..9b9f82aab2c 100644 --- a/TAO/orbsvcs/examples/Security/Send_File/server.cpp +++ b/TAO/orbsvcs/examples/Security/Send_File/server.cpp @@ -86,7 +86,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); ACE_OS::sleep (5); } diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp index 72507316dc3..d3e59a5cb51 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp @@ -323,7 +323,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp index 55fe8e4641f..dd461f6fdae 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp @@ -319,7 +319,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp index 487bb92dab3..66094a47083 100644 --- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp @@ -348,7 +348,7 @@ ACE_TMAIN (int argc, ACE_ERROR_RETURN ((LM_ERROR,"client::init failed\n"),1); result = CLIENT::instance ()->run (); - poa->destroy (1, 1); + poa->destroy (true, true); orb->destroy (); diff --git a/TAO/orbsvcs/tests/Bug_1395_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_1395_Regression/server.cpp index 5873276dd90..e5be4e90c2f 100644 --- a/TAO/orbsvcs/tests/Bug_1395_Regression/server.cpp +++ b/TAO/orbsvcs/tests/Bug_1395_Regression/server.cpp @@ -117,7 +117,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) orb->run (); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); } catch (const CORBA::Exception& ex) { diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/server.cpp index 53cdb4e4ec8..f983ad306dd 100644 --- a/TAO/orbsvcs/tests/Bug_2285_Regression/server.cpp +++ b/TAO/orbsvcs/tests/Bug_2285_Regression/server.cpp @@ -191,7 +191,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/server2.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/server2.cpp index 2ff69131f4b..23ba5d49388 100644 --- a/TAO/orbsvcs/tests/Bug_2285_Regression/server2.cpp +++ b/TAO/orbsvcs/tests/Bug_2285_Regression/server2.cpp @@ -133,7 +133,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) orb->run (); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2287_Regression/server.cpp index 9b996a3abb6..74a4a85be49 100644 --- a/TAO/orbsvcs/tests/Bug_2287_Regression/server.cpp +++ b/TAO/orbsvcs/tests/Bug_2287_Regression/server.cpp @@ -195,7 +195,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/orbsvcs/tests/Bug_2377_Regression/uipmc_test.cpp b/TAO/orbsvcs/tests/Bug_2377_Regression/uipmc_test.cpp index b201c95b513..c76f9a61566 100644 --- a/TAO/orbsvcs/tests/Bug_2377_Regression/uipmc_test.cpp +++ b/TAO/orbsvcs/tests/Bug_2377_Regression/uipmc_test.cpp @@ -235,7 +235,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) "\n (%P|%t) No single call got through to the server\n"), 3); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2615_Regression/server.cpp index cf624587455..66fc310132d 100644 --- a/TAO/orbsvcs/tests/Bug_2615_Regression/server.cpp +++ b/TAO/orbsvcs/tests/Bug_2615_Regression/server.cpp @@ -205,7 +205,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/Server_Task.cpp b/TAO/orbsvcs/tests/Bug_2709_Regression/Server_Task.cpp index eaa5b66865a..f7904897fff 100644 --- a/TAO/orbsvcs/tests/Bug_2709_Regression/Server_Task.cpp +++ b/TAO/orbsvcs/tests/Bug_2709_Regression/Server_Task.cpp @@ -65,7 +65,7 @@ Server_Task::svc (void) ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); } catch (const CORBA::Exception& ex) { diff --git a/TAO/orbsvcs/tests/Bug_2925_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2925_Regression/server.cpp index 7c6ac21a3b1..385b4856c5d 100644 --- a/TAO/orbsvcs/tests/Bug_2925_Regression/server.cpp +++ b/TAO/orbsvcs/tests/Bug_2925_Regression/server.cpp @@ -123,7 +123,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) orb->run (); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); diff --git a/TAO/orbsvcs/tests/Bug_3215_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_3215_Regression/server.cpp index 3c1da0dded8..70f288cd8fc 100644 --- a/TAO/orbsvcs/tests/Bug_3215_Regression/server.cpp +++ b/TAO/orbsvcs/tests/Bug_3215_Regression/server.cpp @@ -215,14 +215,11 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) poa_manager->activate (); - orb->run (); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1 ); - + root_poa->destroy (1, 1); orb->destroy (); } diff --git a/TAO/orbsvcs/tests/Bug_3216_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_3216_Regression/server.cpp index 4600310435b..2cc6c56815f 100644 --- a/TAO/orbsvcs/tests/Bug_3216_Regression/server.cpp +++ b/TAO/orbsvcs/tests/Bug_3216_Regression/server.cpp @@ -216,11 +216,9 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1 ); - + root_poa->destroy (1, 1); orb->destroy (); - } catch (const CORBA::Exception& ex) { @@ -229,6 +227,5 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) return 1; } - return 0; } diff --git a/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventConsumer_i.cpp b/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventConsumer_i.cpp index 053fb8d0f34..478bc730b33 100644 --- a/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventConsumer_i.cpp +++ b/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventConsumer_i.cpp @@ -11,49 +11,43 @@ StructuredEventConsumer_i::StructuredEventConsumer_i(CORBA::ORB_ptr orb) void StructuredEventConsumer_i::push_structured_event( - const CosNotification::StructuredEvent &event - ) + const CosNotification::StructuredEvent &event) { - std::cout << "event received " << std::endl; - const char *value; + const char *value = 0; for (unsigned int i=0; i<event.filterable_data.length(); i++) { event.filterable_data[i].value >>= value; std::cout << event.filterable_data[i].name.in() << "\t" << value << std::endl; } - count_++; - if ( count_ >= 3 ) + ++count_; + if (count_ >= 3) { consumerStop(); } - } void StructuredEventConsumer_i::disconnect_structured_push_consumer() { - CORBA::Object_var obj = orb_->resolve_initial_references ("POACurrent"); PortableServer::Current_var current = PortableServer::Current::_narrow (obj.in()); PortableServer::POA_var poa = current->get_POA (); PortableServer::ObjectId_var objectId = current->get_object_id (); poa->deactivate_object (objectId.in()); - } void StructuredEventConsumer_i::offer_change( const CosNotification::EventTypeSeq &, - const CosNotification::EventTypeSeq & - ) + const CosNotification::EventTypeSeq &) { } int StructuredEventConsumer_i::nummsgs() { - return count_; + return count_; } diff --git a/TAO/orbsvcs/tests/Bug_3598b_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_3598b_Regression/server.cpp index 90979bacc9f..4dfc1df9d87 100644 --- a/TAO/orbsvcs/tests/Bug_3598b_Regression/server.cpp +++ b/TAO/orbsvcs/tests/Bug_3598b_Regression/server.cpp @@ -77,7 +77,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - root_poa->destroy (1, 1 ); + root_poa->destroy (1, 1); orb->destroy (); diff --git a/TAO/orbsvcs/tests/Bug_3891_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_3891_Regression/server.cpp index 87d6eb3cdae..d9997da7983 100644 --- a/TAO/orbsvcs/tests/Bug_3891_Regression/server.cpp +++ b/TAO/orbsvcs/tests/Bug_3891_Regression/server.cpp @@ -60,7 +60,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_ERROR_RETURN ((LM_ERROR, "ERROR: type_id is incorrect\n"), 1); } - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } catch (const CORBA::Exception& ex) diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp index 6ef684dc6cb..91776012695 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp +++ b/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp @@ -35,7 +35,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // **************************************************************** - poa->destroy (1, 1); + poa->destroy (true, true); orb->destroy (); diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp index bcb8dfb4c0a..d8d9bc52d97 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp +++ b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp @@ -35,7 +35,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // **************************************************************** - poa->destroy (1, 1); + poa->destroy (true, true); orb->destroy (); diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp index 5310576888a..755e2fe0ab4 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp +++ b/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp @@ -161,7 +161,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // **************************************************************** - poa->destroy (1, 1); + poa->destroy (true, true); orb->destroy (); diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp index 72008720fa6..a366e6783c5 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp +++ b/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp @@ -134,7 +134,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // **************************************************************** - poa->destroy (1, 1); + poa->destroy (true, true); orb->destroy (); diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp index e683a8be7c9..8ad7a6de0f8 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp +++ b/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp @@ -207,7 +207,7 @@ RND_Driver::run (int argc, ACE_TCHAR *argv[]) // **************************************************************** - poa->destroy (1, 1); + poa->destroy (true, true); // **************************************************************** diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp index d404a69e6c5..97f5c3e325f 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp +++ b/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp @@ -33,7 +33,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // **************************************************************** - poa->destroy (1, 1); + poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp b/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp index 9dcad7cb70e..464cd574c18 100644 --- a/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp +++ b/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp @@ -328,7 +328,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // Now we can destroy the POA, the flags mean that we want to // wait until the POA is really destroyed - poa->destroy (1, 1); + poa->destroy (true, true); // Finally destroy the ORB orb->destroy (); diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp index f61723b3279..e63814343d8 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp @@ -177,7 +177,7 @@ ECT_Consumer_Driver::run (int argc, ACE_TCHAR* argv[]) channel->destroy (); } - root_poa->destroy (1, 1); + root_poa->destroy (true, true); this->orb_->destroy (); } diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp index bcaf9071e28..8f64e4f77f4 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp @@ -189,7 +189,7 @@ ECT_Supplier_Driver::run (int argc, ACE_TCHAR* argv[]) // @@ Deactivate the suppliers (as CORBA Objects?) - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); diff --git a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp index a9fd87264e1..341364a0add 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp @@ -165,7 +165,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // **************************************************************** - poa->destroy (1, 1); + poa->destroy (true, true); // **************************************************************** diff --git a/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp b/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp index a74ba7bdbe3..647f4ef0f66 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp @@ -179,7 +179,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // **************************************************************** - poa->destroy (1, 1); + poa->destroy (true, true); // **************************************************************** diff --git a/TAO/orbsvcs/tests/Event/Basic/Complex.cpp b/TAO/orbsvcs/tests/Event/Basic/Complex.cpp index f52fd4dbd35..4a468fdaec2 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Complex.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Complex.cpp @@ -163,7 +163,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // **************************************************************** - poa->destroy (1, 1); + poa->destroy (true, true); orb->destroy (); diff --git a/TAO/orbsvcs/tests/Event/Basic/Control.cpp b/TAO/orbsvcs/tests/Event/Basic/Control.cpp index 3f773a72e5e..64cf9f4178f 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Control.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Control.cpp @@ -118,7 +118,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // **************************************************************** - poa->destroy (1, 1); + poa->destroy (true, true); // **************************************************************** diff --git a/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp index 72681c72a93..5e21504ad0a 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp @@ -36,7 +36,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // **************************************************************** - poa->destroy (1, 1); + poa->destroy (true, true); orb->destroy (); diff --git a/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp b/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp index 35965afa1bf..cfd268f5ac6 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp @@ -291,7 +291,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // **************************************************************** - poa->destroy (1, 1); + poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp index 41ef8866b22..ffc8063c080 100644 --- a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp @@ -37,7 +37,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // **************************************************************** - poa->destroy (1, 1); + poa->destroy (true, true); orb->destroy (); diff --git a/TAO/orbsvcs/tests/Event/Basic/Negation.cpp b/TAO/orbsvcs/tests/Event/Basic/Negation.cpp index cede269c38a..ecbfa245783 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Negation.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Negation.cpp @@ -147,7 +147,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // **************************************************************** - poa->destroy (1, 1); + poa->destroy (true, true); // **************************************************************** diff --git a/TAO/orbsvcs/tests/Event/Basic/Random.cpp b/TAO/orbsvcs/tests/Event/Basic/Random.cpp index b3b557a1c89..724d404cdb9 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Random.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Random.cpp @@ -243,7 +243,7 @@ RND_Driver::run (int argc, ACE_TCHAR *argv[]) // **************************************************************** - poa->destroy (1, 1); + poa->destroy (true, true); // **************************************************************** diff --git a/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp b/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp index 638ea4c3101..15a1d387c55 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp @@ -153,7 +153,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // **************************************************************** - poa->destroy (1, 1); + poa->destroy (true, true); // **************************************************************** diff --git a/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp b/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp index 93eea269c6c..b97814f5a1f 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp @@ -211,7 +211,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // **************************************************************** - poa->destroy (1, 1); + poa->destroy (true, true); orb->destroy (); diff --git a/TAO/orbsvcs/tests/Event/UDP/receiver.cpp b/TAO/orbsvcs/tests/Event/UDP/receiver.cpp index c33e8119b9f..6527f2ff492 100644 --- a/TAO/orbsvcs/tests/Event/UDP/receiver.cpp +++ b/TAO/orbsvcs/tests/Event/UDP/receiver.cpp @@ -275,7 +275,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // Now we can destroy the POA, the flags mean that we want to // wait until the POA is really destroyed - poa->destroy (1, 1); + poa->destroy (true, true); // Finally destroy the ORB orb->destroy (); diff --git a/TAO/orbsvcs/tests/Event/UDP/sender.cpp b/TAO/orbsvcs/tests/Event/UDP/sender.cpp index 19d88f50a89..1e26adc8e92 100644 --- a/TAO/orbsvcs/tests/Event/UDP/sender.cpp +++ b/TAO/orbsvcs/tests/Event/UDP/sender.cpp @@ -226,7 +226,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // Now we can destroy the POA, the flags mean that we want to // wait until the POA is really destroyed - poa->destroy (1, 1); + poa->destroy (true, true); // Finally destroy the ORB orb->destroy (); diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp index 53c65dd74e9..2b04f3871d1 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp @@ -255,7 +255,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // Run the ORB event loop. orb->run (); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp index a1cf40b7a2c..8e9f9941fa2 100644 --- a/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp +++ b/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp @@ -245,9 +245,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) //client.ami_test_var_->shutdown (); - root_poa->destroy (1, // ethernalize objects - 0 // wait for completion - ); + root_poa->destroy (true, // ethernalize objects + false); // wait for completion orb->destroy (); } diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/server.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/server.cpp index 6c89c1c7b26..8a9784588c9 100644 --- a/TAO/orbsvcs/tests/HTIOP/AMI/server.cpp +++ b/TAO/orbsvcs/tests/HTIOP/AMI/server.cpp @@ -103,9 +103,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) orb->run (); - root_poa->destroy (1, // ethernalize objects - 0 // wait for completion - ); + root_poa->destroy (true, // ethernalize objects + false); // wait for completion orb->destroy (); diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp b/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp index 53352e04b91..9263fbe4b54 100644 --- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp +++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp @@ -129,7 +129,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) orb->run (); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); } catch (const CORBA::Exception& ex) @@ -139,7 +139,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) } if (!CORBA::is_nil(root_poa.in())) - root_poa->destroy (1,1); + root_poa->destroy (1, 1); delete servant; return 0; diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp b/TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp index 449144691ff..f9e6a88977e 100644 --- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp +++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp @@ -141,7 +141,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) } ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); } catch (const CORBA::Exception& ex) { diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/server.cpp b/TAO/orbsvcs/tests/HTIOP/Hello/server.cpp index 8b2779e1a30..94f7af800e4 100644 --- a/TAO/orbsvcs/tests/HTIOP/Hello/server.cpp +++ b/TAO/orbsvcs/tests/HTIOP/Hello/server.cpp @@ -123,7 +123,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - Root poa destroyed\n")); diff --git a/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp b/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp index 626dd0d8ef8..fe851c004e9 100644 --- a/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp +++ b/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp @@ -94,7 +94,7 @@ Server_i::init (int &argc, this->orb_->run (); //Destroy the POA, waiting until the destruction terminates. - poa->destroy (1, 1); + poa->destroy (true, true); this->orb_->destroy (); } catch (const CORBA::Exception& ex) diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/MessengerServer.cpp b/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/MessengerServer.cpp index bc8ddefc337..3016779a973 100644 --- a/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/MessengerServer.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/MessengerServer.cpp @@ -111,7 +111,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_OS::sleep(1); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Messenger server shutting down.\n"))); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); return 0; } diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp index 1b8fe6b409f..8e0bb0fc9f7 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp @@ -127,8 +127,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) orb->run (); - root_poa->destroy (1, - 1); + root_poa->destroy (1, 1); orb->destroy (); } diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/server.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/server.cpp index aaedcb4a1bf..c2ad5bff2bd 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/server.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/server.cpp @@ -89,7 +89,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/server.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/server.cpp index 2c78cb4a442..3a41fc23130 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/server.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/server.cpp @@ -88,7 +88,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, ACE_TEXT("(%P|%t) server - event loop finished\n"))); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/orbsvcs/tests/Miop/McastHello/server.cpp b/TAO/orbsvcs/tests/Miop/McastHello/server.cpp index 08f366bcb8b..91edae7d562 100644 --- a/TAO/orbsvcs/tests/Miop/McastHello/server.cpp +++ b/TAO/orbsvcs/tests/Miop/McastHello/server.cpp @@ -97,7 +97,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); diff --git a/TAO/orbsvcs/tests/Miop/McastLocal/server.cpp b/TAO/orbsvcs/tests/Miop/McastLocal/server.cpp index 08f366bcb8b..91edae7d562 100644 --- a/TAO/orbsvcs/tests/Miop/McastLocal/server.cpp +++ b/TAO/orbsvcs/tests/Miop/McastLocal/server.cpp @@ -97,7 +97,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); diff --git a/TAO/orbsvcs/tests/Miop/McastZIOP/server.cpp b/TAO/orbsvcs/tests/Miop/McastZIOP/server.cpp index 201b71c6185..f01ac900787 100644 --- a/TAO/orbsvcs/tests/Miop/McastZIOP/server.cpp +++ b/TAO/orbsvcs/tests/Miop/McastZIOP/server.cpp @@ -141,7 +141,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) } // Shutdown the orb - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); // Validate that our servants got the right requests. diff --git a/TAO/orbsvcs/tests/Notify/Validate_Client/proxy_dummy.cpp b/TAO/orbsvcs/tests/Notify/Validate_Client/proxy_dummy.cpp index 591774c371f..a1b9e3501a9 100644 --- a/TAO/orbsvcs/tests/Notify/Validate_Client/proxy_dummy.cpp +++ b/TAO/orbsvcs/tests/Notify/Validate_Client/proxy_dummy.cpp @@ -182,7 +182,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp b/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp index f57023d75e0..27a24639088 100644 --- a/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp +++ b/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp @@ -316,7 +316,7 @@ int ACE_TMAIN (int ac, ACE_TCHAR *av[]) ecf->destroy(); } - poa->destroy (1, 1); + poa->destroy (true, true); orb->destroy (); poa = PortableServer::POA::_nil (); orb = CORBA::ORB::_nil (); diff --git a/TAO/orbsvcs/tests/Property/server.cpp b/TAO/orbsvcs/tests/Property/server.cpp index c356504219d..8e65a4fe98d 100644 --- a/TAO/orbsvcs/tests/Property/server.cpp +++ b/TAO/orbsvcs/tests/Property/server.cpp @@ -86,7 +86,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // Run the ORB Event loop. orb->run (); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp b/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp index 32eab375998..9c81e257b95 100644 --- a/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp +++ b/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp @@ -170,7 +170,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_OS::abort (); } - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/server.cpp b/TAO/orbsvcs/tests/Security/BiDirectional/server.cpp index ce7fd2a4524..0b3a484f806 100644 --- a/TAO/orbsvcs/tests/Security/BiDirectional/server.cpp +++ b/TAO/orbsvcs/tests/Security/BiDirectional/server.cpp @@ -141,7 +141,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) } ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("event loop finished\n"))); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/orbsvcs/tests/Security/Bug_1107_Regression/server.cpp b/TAO/orbsvcs/tests/Security/Bug_1107_Regression/server.cpp index 6612b8f50c0..18ed207e4b1 100644 --- a/TAO/orbsvcs/tests/Security/Bug_1107_Regression/server.cpp +++ b/TAO/orbsvcs/tests/Security/Bug_1107_Regression/server.cpp @@ -136,7 +136,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) "\n" "Event loop finished.\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/MessengerServer.cpp b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/MessengerServer.cpp index 1a23c3f50a4..9e692470a23 100644 --- a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/MessengerServer.cpp +++ b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/MessengerServer.cpp @@ -86,7 +86,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // Accept requests orb->run(); - poa->destroy (1, 1); + poa->destroy (true, true); orb->destroy(); } diff --git a/TAO/orbsvcs/tests/Security/Callback/client.cpp b/TAO/orbsvcs/tests/Security/Callback/client.cpp index 01c2927159f..723a82b5006 100644 --- a/TAO/orbsvcs/tests/Security/Callback/client.cpp +++ b/TAO/orbsvcs/tests/Security/Callback/client.cpp @@ -120,7 +120,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) server_obj->shutdown (); - poa->destroy (1, 1); + poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/orbsvcs/tests/Security/Callback/server.cpp b/TAO/orbsvcs/tests/Security/Callback/server.cpp index 3df90db03c0..b08537aa825 100644 --- a/TAO/orbsvcs/tests/Security/Callback/server.cpp +++ b/TAO/orbsvcs/tests/Security/Callback/server.cpp @@ -101,7 +101,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) orb->run (); - poa->destroy (1, 1); + poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp b/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp index 667b02c61a4..2bc01f9b689 100644 --- a/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp +++ b/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp @@ -123,9 +123,9 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "SERVER (%P): Event loop finished.\n")); - persistent_poa->destroy (1, 1); + persistent_poa->destroy (true, true); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); ACE_OS::sleep (1); diff --git a/TAO/orbsvcs/tests/Security/EndpointPolicy/test.cpp b/TAO/orbsvcs/tests/Security/EndpointPolicy/test.cpp index df9c4ed4ffc..d2b7d81cd64 100644 --- a/TAO/orbsvcs/tests/Security/EndpointPolicy/test.cpp +++ b/TAO/orbsvcs/tests/Security/EndpointPolicy/test.cpp @@ -181,7 +181,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { ex._tao_print_exception ("cannot run server"); } - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/client.cpp b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/client.cpp index 264e4098f8d..14056b16ec7 100644 --- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/client.cpp +++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/client.cpp @@ -137,8 +137,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) "(%P|%t) Number of events received.. [%d]\n", count)); - root_poa->destroy (1, - 1); + root_poa->destroy (1, 1); } catch (const CORBA::Exception& ex) { diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/server.cpp b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/server.cpp index ce5b925c9e8..68a39ceda53 100644 --- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/server.cpp +++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/server.cpp @@ -163,8 +163,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_Thread_Manager::instance ()->wait (); - root_poa->destroy (1, - 1); + root_poa->destroy (1, 1); } catch (const CORBA::Exception& ex) { diff --git a/TAO/orbsvcs/tests/Security/Null_Cipher/server.cpp b/TAO/orbsvcs/tests/Security/Null_Cipher/server.cpp index 64e2e62e4bb..9b4a9f781a2 100644 --- a/TAO/orbsvcs/tests/Security/Null_Cipher/server.cpp +++ b/TAO/orbsvcs/tests/Security/Null_Cipher/server.cpp @@ -95,7 +95,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) "\n" "Event loop finished.\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp b/TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp index d907397ce08..c8fc2390ff8 100644 --- a/TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp +++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp @@ -125,7 +125,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) "\n" "Event loop finished.\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/orbsvcs/tests/ior_corbaname/server.cpp b/TAO/orbsvcs/tests/ior_corbaname/server.cpp index e3908eeba4b..cafd991d555 100644 --- a/TAO/orbsvcs/tests/ior_corbaname/server.cpp +++ b/TAO/orbsvcs/tests/ior_corbaname/server.cpp @@ -47,7 +47,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) orb->run (); // Destroy the POA, waiting until the destruction terminates - poa->destroy (1, 1); + poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/performance-tests/Latency/AMH_Single_Threaded/server.cpp b/TAO/performance-tests/Latency/AMH_Single_Threaded/server.cpp index d9da49e21cd..209c71bf7c3 100644 --- a/TAO/performance-tests/Latency/AMH_Single_Threaded/server.cpp +++ b/TAO/performance-tests/Latency/AMH_Single_Threaded/server.cpp @@ -108,7 +108,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/performance-tests/Latency/AMI/client.cpp b/TAO/performance-tests/Latency/AMI/client.cpp index b7223db09cd..adefa42bb66 100644 --- a/TAO/performance-tests/Latency/AMI/client.cpp +++ b/TAO/performance-tests/Latency/AMI/client.cpp @@ -154,7 +154,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) roundtrip->shutdown (); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/performance-tests/Latency/AMI/server.cpp b/TAO/performance-tests/Latency/AMI/server.cpp index def5bed8ae5..0951ffe2be9 100644 --- a/TAO/performance-tests/Latency/AMI/server.cpp +++ b/TAO/performance-tests/Latency/AMI/server.cpp @@ -128,7 +128,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/performance-tests/Latency/Collocation/Server_Task.cpp b/TAO/performance-tests/Latency/Collocation/Server_Task.cpp index 006a4de5723..4ab05dd7b3b 100644 --- a/TAO/performance-tests/Latency/Collocation/Server_Task.cpp +++ b/TAO/performance-tests/Latency/Collocation/Server_Task.cpp @@ -63,7 +63,7 @@ Server_Task::svc (void) this->sorb_->run (); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); this->sorb_->destroy (); } diff --git a/TAO/performance-tests/Latency/DII/server.cpp b/TAO/performance-tests/Latency/DII/server.cpp index d9da49e21cd..209c71bf7c3 100644 --- a/TAO/performance-tests/Latency/DII/server.cpp +++ b/TAO/performance-tests/Latency/DII/server.cpp @@ -108,7 +108,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/performance-tests/Latency/DSI/server.cpp b/TAO/performance-tests/Latency/DSI/server.cpp index 71b0808a4fd..3f26308a7ca 100644 --- a/TAO/performance-tests/Latency/DSI/server.cpp +++ b/TAO/performance-tests/Latency/DSI/server.cpp @@ -111,7 +111,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/performance-tests/Latency/Deferred/server.cpp b/TAO/performance-tests/Latency/Deferred/server.cpp index d9da49e21cd..209c71bf7c3 100644 --- a/TAO/performance-tests/Latency/Deferred/server.cpp +++ b/TAO/performance-tests/Latency/Deferred/server.cpp @@ -108,7 +108,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/performance-tests/Latency/Single_Threaded/server.cpp b/TAO/performance-tests/Latency/Single_Threaded/server.cpp index fb08b8fa1cd..529769656f1 100644 --- a/TAO/performance-tests/Latency/Single_Threaded/server.cpp +++ b/TAO/performance-tests/Latency/Single_Threaded/server.cpp @@ -113,7 +113,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/performance-tests/Latency/Thread_Per_Connection/server.cpp b/TAO/performance-tests/Latency/Thread_Per_Connection/server.cpp index fb08b8fa1cd..529769656f1 100644 --- a/TAO/performance-tests/Latency/Thread_Per_Connection/server.cpp +++ b/TAO/performance-tests/Latency/Thread_Per_Connection/server.cpp @@ -113,7 +113,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/performance-tests/Latency/Thread_Pool/server.cpp b/TAO/performance-tests/Latency/Thread_Pool/server.cpp index cd5e70115aa..d35b4a08a41 100644 --- a/TAO/performance-tests/Latency/Thread_Pool/server.cpp +++ b/TAO/performance-tests/Latency/Thread_Pool/server.cpp @@ -117,7 +117,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/performance-tests/Memory/IORsize/server.cpp b/TAO/performance-tests/Memory/IORsize/server.cpp index e9d9f3fb751..a026bd923f1 100644 --- a/TAO/performance-tests/Memory/IORsize/server.cpp +++ b/TAO/performance-tests/Memory/IORsize/server.cpp @@ -85,7 +85,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/performance-tests/Memory/Single_Threaded/server.cpp b/TAO/performance-tests/Memory/Single_Threaded/server.cpp index e9d9f3fb751..a026bd923f1 100644 --- a/TAO/performance-tests/Memory/Single_Threaded/server.cpp +++ b/TAO/performance-tests/Memory/Single_Threaded/server.cpp @@ -85,7 +85,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/performance-tests/POA/Create_Reference/create_reference.cpp b/TAO/performance-tests/POA/Create_Reference/create_reference.cpp index 174255b5bf5..954962e5c3a 100644 --- a/TAO/performance-tests/POA/Create_Reference/create_reference.cpp +++ b/TAO/performance-tests/POA/Create_Reference/create_reference.cpp @@ -170,7 +170,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) 1 // POA::create_reference_with_id ); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/performance-tests/POA/Implicit_Activation/collocated.cpp b/TAO/performance-tests/POA/Implicit_Activation/collocated.cpp index 8aa76f08e8c..091ecb4f5f8 100644 --- a/TAO/performance-tests/POA/Implicit_Activation/collocated.cpp +++ b/TAO/performance-tests/POA/Implicit_Activation/collocated.cpp @@ -151,7 +151,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) destruction.collect_basic_stats (destruction_stats); destruction_stats.dump_results (ACE_TEXT("Destruction"), gsf); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/performance-tests/POA/Implicit_Activation/server.cpp b/TAO/performance-tests/POA/Implicit_Activation/server.cpp index 1d9054487c8..4cef3ab975f 100644 --- a/TAO/performance-tests/POA/Implicit_Activation/server.cpp +++ b/TAO/performance-tests/POA/Implicit_Activation/server.cpp @@ -107,7 +107,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp b/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp index eeafad168a6..30b08bd8998 100644 --- a/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp +++ b/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp @@ -393,8 +393,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) child_poa_testing (root_poa.in ()); // Destroy RootPOA. - root_poa->destroy (1, - 1); + root_poa->destroy (1, 1); // Cleanup delete[] object_ids; diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/server.cpp b/TAO/performance-tests/RTCorba/Oneways/Reliable/server.cpp index 4e8f517450b..deef0062d3f 100644 --- a/TAO/performance-tests/RTCorba/Oneways/Reliable/server.cpp +++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/server.cpp @@ -142,8 +142,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - root_poa->destroy (1, - 1); + root_poa->destroy (1, 1); } catch (const CORBA::Exception& ex) { diff --git a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/server.cpp b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/server.cpp index d9da49e21cd..209c71bf7c3 100644 --- a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/server.cpp +++ b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/server.cpp @@ -108,7 +108,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/performance-tests/Sequence_Latency/AMI/client.cpp b/TAO/performance-tests/Sequence_Latency/AMI/client.cpp index 7cfef21bc2b..80a86a84e5b 100644 --- a/TAO/performance-tests/Sequence_Latency/AMI/client.cpp +++ b/TAO/performance-tests/Sequence_Latency/AMI/client.cpp @@ -469,7 +469,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) roundtrip->shutdown (); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/performance-tests/Sequence_Latency/AMI/server.cpp b/TAO/performance-tests/Sequence_Latency/AMI/server.cpp index def5bed8ae5..0951ffe2be9 100644 --- a/TAO/performance-tests/Sequence_Latency/AMI/server.cpp +++ b/TAO/performance-tests/Sequence_Latency/AMI/server.cpp @@ -128,7 +128,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/performance-tests/Sequence_Latency/DII/server.cpp b/TAO/performance-tests/Sequence_Latency/DII/server.cpp index d9da49e21cd..209c71bf7c3 100644 --- a/TAO/performance-tests/Sequence_Latency/DII/server.cpp +++ b/TAO/performance-tests/Sequence_Latency/DII/server.cpp @@ -108,7 +108,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/performance-tests/Sequence_Latency/DSI/server.cpp b/TAO/performance-tests/Sequence_Latency/DSI/server.cpp index 71b0808a4fd..3f26308a7ca 100644 --- a/TAO/performance-tests/Sequence_Latency/DSI/server.cpp +++ b/TAO/performance-tests/Sequence_Latency/DSI/server.cpp @@ -111,7 +111,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/server.cpp b/TAO/performance-tests/Sequence_Latency/Deferred/server.cpp index d9da49e21cd..209c71bf7c3 100644 --- a/TAO/performance-tests/Sequence_Latency/Deferred/server.cpp +++ b/TAO/performance-tests/Sequence_Latency/Deferred/server.cpp @@ -108,7 +108,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/performance-tests/Sequence_Latency/Single_Threaded/server.cpp b/TAO/performance-tests/Sequence_Latency/Single_Threaded/server.cpp index efacd2f57e0..cf5aa69814b 100644 --- a/TAO/performance-tests/Sequence_Latency/Single_Threaded/server.cpp +++ b/TAO/performance-tests/Sequence_Latency/Single_Threaded/server.cpp @@ -114,7 +114,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/server.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/server.cpp index fb08b8fa1cd..529769656f1 100644 --- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/server.cpp +++ b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/server.cpp @@ -113,7 +113,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/server.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Pool/server.cpp index 8107554e861..52c17060905 100644 --- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/server.cpp +++ b/TAO/performance-tests/Sequence_Latency/Thread_Pool/server.cpp @@ -117,7 +117,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/performance-tests/Throughput/server.cpp b/TAO/performance-tests/Throughput/server.cpp index 48697e5e52a..a9de20dedc3 100644 --- a/TAO/performance-tests/Throughput/server.cpp +++ b/TAO/performance-tests/Throughput/server.cpp @@ -87,7 +87,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "Server event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/AMI/client.cpp b/TAO/tests/AMI/client.cpp index 5c8268de7e6..17480ca2adb 100644 --- a/TAO/tests/AMI/client.cpp +++ b/TAO/tests/AMI/client.cpp @@ -283,8 +283,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) server->shutdown (); } - root_poa->destroy (1, // ethernalize objects - 0); // wait for completion + root_poa->destroy (true, // ethernalize objects + false); // wait for completion orb->destroy (); } diff --git a/TAO/tests/AMI/server.cpp b/TAO/tests/AMI/server.cpp index e1aa13af889..3b7be08366d 100644 --- a/TAO/tests/AMI/server.cpp +++ b/TAO/tests/AMI/server.cpp @@ -103,9 +103,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) orb->run (); - root_poa->destroy (1, // ethernalize objects - 0 // wait for completion - ); + root_poa->destroy (true, // ethernalize objects + false); // wait for completion orb->destroy (); diff --git a/TAO/tests/AMI_Buffering/admin.cpp b/TAO/tests/AMI_Buffering/admin.cpp index 8c449e083ee..9b8c43ea1f5 100644 --- a/TAO/tests/AMI_Buffering/admin.cpp +++ b/TAO/tests/AMI_Buffering/admin.cpp @@ -88,7 +88,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) admin - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/AMI_Buffering/client.cpp b/TAO/tests/AMI_Buffering/client.cpp index a323ba68d40..1a0ca510390 100644 --- a/TAO/tests/AMI_Buffering/client.cpp +++ b/TAO/tests/AMI_Buffering/client.cpp @@ -223,7 +223,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ami_buffering->shutdown (); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/AMI_Buffering/server.cpp b/TAO/tests/AMI_Buffering/server.cpp index 2c0186d3b12..909cae83090 100644 --- a/TAO/tests/AMI_Buffering/server.cpp +++ b/TAO/tests/AMI_Buffering/server.cpp @@ -109,7 +109,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/AMI_Timeouts/client.cpp b/TAO/tests/AMI_Timeouts/client.cpp index e8f09f22673..5f361473c3a 100644 --- a/TAO/tests/AMI_Timeouts/client.cpp +++ b/TAO/tests/AMI_Timeouts/client.cpp @@ -118,9 +118,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // ORB loop. orb->run (); // Fetch responses - root_poa->destroy (1, // ethernalize objects - 0 // wait for completion - ); + root_poa->destroy (true, // ethernalize objects + false); // wait for completion // Wait for all the threads to finish before destroying the // ORB. diff --git a/TAO/tests/AMI_Timeouts/server.cpp b/TAO/tests/AMI_Timeouts/server.cpp index 1c2f25063e2..7946d4ae2cf 100644 --- a/TAO/tests/AMI_Timeouts/server.cpp +++ b/TAO/tests/AMI_Timeouts/server.cpp @@ -122,12 +122,10 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) orb->run (); - ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - root_poa->destroy (1, // ethernalize objects - 0 // wait for completion - ); + root_poa->destroy (true, // ethernalize objects + false); // wait for completion orb->destroy (); diff --git a/TAO/tests/Abstract_Interface/server.cpp b/TAO/tests/Abstract_Interface/server.cpp index 43563246979..27aea746180 100644 --- a/TAO/tests/Abstract_Interface/server.cpp +++ b/TAO/tests/Abstract_Interface/server.cpp @@ -129,7 +129,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) orb->run (); // Destroy the POA, waiting until the destruction terminates - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Any/Recursive/server.cpp b/TAO/tests/Any/Recursive/server.cpp index 93f0474ab01..f25f9398edb 100644 --- a/TAO/tests/Any/Recursive/server.cpp +++ b/TAO/tests/Any/Recursive/server.cpp @@ -88,7 +88,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/BiDirectional/client.cpp b/TAO/tests/BiDirectional/client.cpp index 88cc37d2a7a..d9ea9fbf372 100644 --- a/TAO/tests/BiDirectional/client.cpp +++ b/TAO/tests/BiDirectional/client.cpp @@ -128,7 +128,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) orb->run (); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); } catch (const CORBA::Exception& ex) diff --git a/TAO/tests/BiDirectional/server.cpp b/TAO/tests/BiDirectional/server.cpp index e1d785b61aa..304b57deed6 100644 --- a/TAO/tests/BiDirectional/server.cpp +++ b/TAO/tests/BiDirectional/server.cpp @@ -138,7 +138,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) } ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); } catch (const CORBA::Exception& ex) { diff --git a/TAO/tests/BiDirectional_DelayedUpcall/client.cpp b/TAO/tests/BiDirectional_DelayedUpcall/client.cpp index f869ee080d6..3ce3740d7ce 100644 --- a/TAO/tests/BiDirectional_DelayedUpcall/client.cpp +++ b/TAO/tests/BiDirectional_DelayedUpcall/client.cpp @@ -137,7 +137,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_Time_Value run_time (5); orb->run (run_time); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); } catch (const CORBA::Exception& ex) { diff --git a/TAO/tests/BiDirectional_DelayedUpcall/server.cpp b/TAO/tests/BiDirectional_DelayedUpcall/server.cpp index 1e5a97f204f..2222280a86e 100644 --- a/TAO/tests/BiDirectional_DelayedUpcall/server.cpp +++ b/TAO/tests/BiDirectional_DelayedUpcall/server.cpp @@ -129,7 +129,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); } catch (const CORBA::Exception& ex) { diff --git a/TAO/tests/BiDirectional_MultipleORB/destroy.cpp b/TAO/tests/BiDirectional_MultipleORB/destroy.cpp index 0491f77ede5..f3446e8b98c 100644 --- a/TAO/tests/BiDirectional_MultipleORB/destroy.cpp +++ b/TAO/tests/BiDirectional_MultipleORB/destroy.cpp @@ -67,7 +67,7 @@ test_with_bidir_poa (int argc, poa_manager->activate (); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); if (destroy_orb) { diff --git a/TAO/tests/BiDirectional_NestedUpcall/client.cpp b/TAO/tests/BiDirectional_NestedUpcall/client.cpp index fbcbc50d110..7e84160fe48 100644 --- a/TAO/tests/BiDirectional_NestedUpcall/client.cpp +++ b/TAO/tests/BiDirectional_NestedUpcall/client.cpp @@ -136,7 +136,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // Shutdown the server server->shutdown (); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); } catch (const CORBA::Exception& ex) diff --git a/TAO/tests/BiDirectional_NestedUpcall/server.cpp b/TAO/tests/BiDirectional_NestedUpcall/server.cpp index 1e5a97f204f..2222280a86e 100644 --- a/TAO/tests/BiDirectional_NestedUpcall/server.cpp +++ b/TAO/tests/BiDirectional_NestedUpcall/server.cpp @@ -129,7 +129,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); } catch (const CORBA::Exception& ex) { diff --git a/TAO/tests/Big_AMI/server.cpp b/TAO/tests/Big_AMI/server.cpp index e1aa13af889..3b7be08366d 100644 --- a/TAO/tests/Big_AMI/server.cpp +++ b/TAO/tests/Big_AMI/server.cpp @@ -103,9 +103,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) orb->run (); - root_poa->destroy (1, // ethernalize objects - 0 // wait for completion - ); + root_poa->destroy (true, // ethernalize objects + false); // wait for completion orb->destroy (); diff --git a/TAO/tests/Big_Oneways/client.cpp b/TAO/tests/Big_Oneways/client.cpp index f0520bcce14..756690d73da 100644 --- a/TAO/tests/Big_Oneways/client.cpp +++ b/TAO/tests/Big_Oneways/client.cpp @@ -92,7 +92,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // Wait for all the threads. ACE_Thread_Manager::instance ()->wait (); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Big_Oneways/server.cpp b/TAO/tests/Big_Oneways/server.cpp index ecec4f69944..088b74d2433 100644 --- a/TAO/tests/Big_Oneways/server.cpp +++ b/TAO/tests/Big_Oneways/server.cpp @@ -205,7 +205,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_OS::sleep (5); // Allow the shutdown message to be processed. ACE_DEBUG ((LM_DEBUG, "Shutdown poa and orb . . .\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Big_Reply/server.cpp b/TAO/tests/Big_Reply/server.cpp index b2a8aeeb46e..f9518505a01 100644 --- a/TAO/tests/Big_Reply/server.cpp +++ b/TAO/tests/Big_Reply/server.cpp @@ -137,7 +137,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); } catch (const CORBA::Exception& ex) { diff --git a/TAO/tests/Big_Request_Muxing/server.cpp b/TAO/tests/Big_Request_Muxing/server.cpp index 40a9f862369..1e5c69be2c4 100644 --- a/TAO/tests/Big_Request_Muxing/server.cpp +++ b/TAO/tests/Big_Request_Muxing/server.cpp @@ -171,7 +171,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) maybe_lost_count, maybe_lost, runtime.sec(), runtime.usec())); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); diff --git a/TAO/tests/Big_Twoways/client.cpp b/TAO/tests/Big_Twoways/client.cpp index f0520bcce14..756690d73da 100644 --- a/TAO/tests/Big_Twoways/client.cpp +++ b/TAO/tests/Big_Twoways/client.cpp @@ -92,7 +92,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // Wait for all the threads. ACE_Thread_Manager::instance ()->wait (); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Big_Twoways/server.cpp b/TAO/tests/Big_Twoways/server.cpp index 824a2427154..29ee60a3bdf 100644 --- a/TAO/tests/Big_Twoways/server.cpp +++ b/TAO/tests/Big_Twoways/server.cpp @@ -204,7 +204,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "Shutdown poa and orb . . .\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Blocking_Sync_None/server.cpp b/TAO/tests/Blocking_Sync_None/server.cpp index 6e345e14007..0cb29461e78 100644 --- a/TAO/tests/Blocking_Sync_None/server.cpp +++ b/TAO/tests/Blocking_Sync_None/server.cpp @@ -88,7 +88,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Bug_1020_Basic_Regression/client.cpp b/TAO/tests/Bug_1020_Basic_Regression/client.cpp index 35578720d25..ebecc2cf9cb 100644 --- a/TAO/tests/Bug_1020_Basic_Regression/client.cpp +++ b/TAO/tests/Bug_1020_Basic_Regression/client.cpp @@ -140,8 +140,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - event loop finished\n")); // Actually the code here should never be reached. - root_poa->destroy (1, - 1); + root_poa->destroy (1, 1); orb->destroy (); } diff --git a/TAO/tests/Bug_1020_Basic_Regression/server.cpp b/TAO/tests/Bug_1020_Basic_Regression/server.cpp index ca8b03ef5e5..3dab1c4edcb 100644 --- a/TAO/tests/Bug_1020_Basic_Regression/server.cpp +++ b/TAO/tests/Bug_1020_Basic_Regression/server.cpp @@ -97,8 +97,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, - 1); + root_poa->destroy (1, 1); orb->destroy (); } diff --git a/TAO/tests/Bug_1020_Regression/client.cpp b/TAO/tests/Bug_1020_Regression/client.cpp index b8e4a93e240..234ca120c13 100644 --- a/TAO/tests/Bug_1020_Regression/client.cpp +++ b/TAO/tests/Bug_1020_Regression/client.cpp @@ -125,7 +125,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Bug_1020_Regression/server.cpp b/TAO/tests/Bug_1020_Regression/server.cpp index c8e74a999a7..e8d1a07c1d4 100644 --- a/TAO/tests/Bug_1020_Regression/server.cpp +++ b/TAO/tests/Bug_1020_Regression/server.cpp @@ -89,7 +89,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Bug_1254_Regression/server.cpp b/TAO/tests/Bug_1254_Regression/server.cpp index ac4911a8e8c..c28ec09a6e3 100644 --- a/TAO/tests/Bug_1254_Regression/server.cpp +++ b/TAO/tests/Bug_1254_Regression/server.cpp @@ -87,7 +87,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Bug_1269_Regression/client.cpp b/TAO/tests/Bug_1269_Regression/client.cpp index f24ba933291..e87829affdb 100644 --- a/TAO/tests/Bug_1269_Regression/client.cpp +++ b/TAO/tests/Bug_1269_Regression/client.cpp @@ -108,7 +108,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - event loop finished\n")); // Actually the code here should never be reached. - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Bug_1269_Regression/server.cpp b/TAO/tests/Bug_1269_Regression/server.cpp index a66c693dd37..66248ed65b7 100644 --- a/TAO/tests/Bug_1269_Regression/server.cpp +++ b/TAO/tests/Bug_1269_Regression/server.cpp @@ -76,7 +76,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Bug_1270_Regression/client.cpp b/TAO/tests/Bug_1270_Regression/client.cpp index 9d29b0e2d8b..5a78c13b798 100644 --- a/TAO/tests/Bug_1270_Regression/client.cpp +++ b/TAO/tests/Bug_1270_Regression/client.cpp @@ -102,7 +102,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - event loop finished\n")); // Actually the code here should never be reached. - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Bug_1270_Regression/server.cpp b/TAO/tests/Bug_1270_Regression/server.cpp index e933927d62e..2034a654755 100644 --- a/TAO/tests/Bug_1270_Regression/server.cpp +++ b/TAO/tests/Bug_1270_Regression/server.cpp @@ -96,7 +96,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Bug_1330_Regression/server.cpp b/TAO/tests/Bug_1330_Regression/server.cpp index e27dc78b513..83b309f26b3 100644 --- a/TAO/tests/Bug_1330_Regression/server.cpp +++ b/TAO/tests/Bug_1330_Regression/server.cpp @@ -104,7 +104,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) orb->run (); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Bug_1361_Regression/client.cpp b/TAO/tests/Bug_1361_Regression/client.cpp index f350bcb6e29..b432f576dc5 100644 --- a/TAO/tests/Bug_1361_Regression/client.cpp +++ b/TAO/tests/Bug_1361_Regression/client.cpp @@ -127,7 +127,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) "(%P|%t) client - event loop finished\n")); // Actually the code here should never be reached. - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Bug_1361_Regression/server.cpp b/TAO/tests/Bug_1361_Regression/server.cpp index 04531c71660..af2560972ed 100644 --- a/TAO/tests/Bug_1361_Regression/server.cpp +++ b/TAO/tests/Bug_1361_Regression/server.cpp @@ -84,8 +84,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) mymanager.wait (); worker.wait (); - root_poa->destroy (1, - 1); + root_poa->destroy (1, 1); orb->destroy (); } diff --git a/TAO/tests/Bug_1383_Regression/SimpleServer.cpp b/TAO/tests/Bug_1383_Regression/SimpleServer.cpp index 6508fddf239..39b687e85aa 100644 --- a/TAO/tests/Bug_1383_Regression/SimpleServer.cpp +++ b/TAO/tests/Bug_1383_Regression/SimpleServer.cpp @@ -64,7 +64,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) } ACE_DEBUG ((LM_DEBUG, "done running\n")); - poa->destroy (1, 1); + poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Bug_1476_Regression/server.cpp b/TAO/tests/Bug_1476_Regression/server.cpp index 225c932dd98..a8b9b72d0f4 100644 --- a/TAO/tests/Bug_1476_Regression/server.cpp +++ b/TAO/tests/Bug_1476_Regression/server.cpp @@ -120,7 +120,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) } } - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Bug_1482_Regression/client.cpp b/TAO/tests/Bug_1482_Regression/client.cpp index 379eaa4830a..7ebbcbc1418 100644 --- a/TAO/tests/Bug_1482_Regression/client.cpp +++ b/TAO/tests/Bug_1482_Regression/client.cpp @@ -100,9 +100,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) client.thr_mgr ()->wait (); - root_poa->destroy (1, // ethernalize objects - 0 // wait for completion - ); + root_poa->destroy (true, // ethernalize objects + false); // wait for completion orb->destroy (); } diff --git a/TAO/tests/Bug_1482_Regression/server.cpp b/TAO/tests/Bug_1482_Regression/server.cpp index 2e968a42f69..86e5679c67b 100644 --- a/TAO/tests/Bug_1482_Regression/server.cpp +++ b/TAO/tests/Bug_1482_Regression/server.cpp @@ -87,7 +87,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Bug_1495_Regression/Server_Task.cpp b/TAO/tests/Bug_1495_Regression/Server_Task.cpp index 22a872b4d2e..0d526c9fe4a 100644 --- a/TAO/tests/Bug_1495_Regression/Server_Task.cpp +++ b/TAO/tests/Bug_1495_Regression/Server_Task.cpp @@ -94,7 +94,7 @@ Server_Task::svc (void) ACE_DEBUG ((LM_DEBUG, "Event loop finished for the thread server.\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); sorb_->destroy (); } diff --git a/TAO/tests/Bug_1495_Regression/Threaded_Server.cpp b/TAO/tests/Bug_1495_Regression/Threaded_Server.cpp index 493f3b3dc20..d41a4bbe4eb 100644 --- a/TAO/tests/Bug_1495_Regression/Threaded_Server.cpp +++ b/TAO/tests/Bug_1495_Regression/Threaded_Server.cpp @@ -147,7 +147,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) } ACE_DEBUG ((LM_DEBUG, "Threaded Server event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Bug_1551_Regression/client.cpp b/TAO/tests/Bug_1551_Regression/client.cpp index 47ad807543a..83ae4e3750f 100644 --- a/TAO/tests/Bug_1551_Regression/client.cpp +++ b/TAO/tests/Bug_1551_Regression/client.cpp @@ -103,8 +103,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) retval = 1; } - root_poa->destroy (1, // ethernalize objects - 0); // wait for completion + root_poa->destroy (true, // ethernalize objects + false); // wait for completion orb->destroy (); } diff --git a/TAO/tests/Bug_1551_Regression/server.cpp b/TAO/tests/Bug_1551_Regression/server.cpp index 69a1d3e7a49..c5ba38858a7 100644 --- a/TAO/tests/Bug_1551_Regression/server.cpp +++ b/TAO/tests/Bug_1551_Regression/server.cpp @@ -120,7 +120,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Bug_1568_Regression/server.cpp b/TAO/tests/Bug_1568_Regression/server.cpp index 9a4a5a12258..5749f95c663 100644 --- a/TAO/tests/Bug_1568_Regression/server.cpp +++ b/TAO/tests/Bug_1568_Regression/server.cpp @@ -154,7 +154,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Bug_1627_Regression/server.cpp b/TAO/tests/Bug_1627_Regression/server.cpp index 9e102561cd5..211ad19cee0 100644 --- a/TAO/tests/Bug_1627_Regression/server.cpp +++ b/TAO/tests/Bug_1627_Regression/server.cpp @@ -99,7 +99,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) orb->run (); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); } catch (const CORBA::Exception& ex) { diff --git a/TAO/tests/Bug_1670_Regression/server.cpp b/TAO/tests/Bug_1670_Regression/server.cpp index ab5f3c2036a..35f5d2f1903 100644 --- a/TAO/tests/Bug_1670_Regression/server.cpp +++ b/TAO/tests/Bug_1670_Regression/server.cpp @@ -155,7 +155,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Bug_1676_Regression/server.cpp b/TAO/tests/Bug_1676_Regression/server.cpp index 93f0474ab01..f25f9398edb 100644 --- a/TAO/tests/Bug_1676_Regression/server.cpp +++ b/TAO/tests/Bug_1676_Regression/server.cpp @@ -88,7 +88,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Bug_2183_Regression/server.cpp b/TAO/tests/Bug_2183_Regression/server.cpp index 16f14a203b8..3bec2ba96b7 100644 --- a/TAO/tests/Bug_2183_Regression/server.cpp +++ b/TAO/tests/Bug_2183_Regression/server.cpp @@ -89,7 +89,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Bug_2186_Regression/server.cpp b/TAO/tests/Bug_2186_Regression/server.cpp index a4f6a40317d..e92a4ea4e9d 100644 --- a/TAO/tests/Bug_2186_Regression/server.cpp +++ b/TAO/tests/Bug_2186_Regression/server.cpp @@ -88,7 +88,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Bug_2188_Regression/server.cpp b/TAO/tests/Bug_2188_Regression/server.cpp index 89110ffe8e5..91e1704f290 100644 --- a/TAO/tests/Bug_2188_Regression/server.cpp +++ b/TAO/tests/Bug_2188_Regression/server.cpp @@ -97,7 +97,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Bug_2289_Regression/server.cpp b/TAO/tests/Bug_2289_Regression/server.cpp index 8ab85f8964d..ec3454f6578 100644 --- a/TAO/tests/Bug_2289_Regression/server.cpp +++ b/TAO/tests/Bug_2289_Regression/server.cpp @@ -110,7 +110,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Bug_2328_Regression/server.cpp b/TAO/tests/Bug_2328_Regression/server.cpp index 563cd9dca61..32a93ee6fc7 100644 --- a/TAO/tests/Bug_2328_Regression/server.cpp +++ b/TAO/tests/Bug_2328_Regression/server.cpp @@ -89,7 +89,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Bug_2349_Regression/server.cpp b/TAO/tests/Bug_2349_Regression/server.cpp index 6e3cfe0601c..c74308883f8 100644 --- a/TAO/tests/Bug_2349_Regression/server.cpp +++ b/TAO/tests/Bug_2349_Regression/server.cpp @@ -132,7 +132,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) orb->run (); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } catch (const CORBA::Exception& ex) diff --git a/TAO/tests/Bug_2356_Regression/server.cpp b/TAO/tests/Bug_2356_Regression/server.cpp index 3bee8f93cbd..b437333e5a6 100644 --- a/TAO/tests/Bug_2356_Regression/server.cpp +++ b/TAO/tests/Bug_2356_Regression/server.cpp @@ -103,8 +103,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) orb->run (); - root_poa->destroy (1, // ethernalize objects - 0); // wait for completion + root_poa->destroy (true, // ethernalize objects + false); // wait for completion orb->destroy (); diff --git a/TAO/tests/Bug_2429_Regression/server.cpp b/TAO/tests/Bug_2429_Regression/server.cpp index 6e11d72ad09..03c918f43e9 100644 --- a/TAO/tests/Bug_2429_Regression/server.cpp +++ b/TAO/tests/Bug_2429_Regression/server.cpp @@ -79,8 +79,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - root_poa->destroy (1, - 1); + root_poa->destroy (1, 1); } catch (const CORBA::Exception& ex) { diff --git a/TAO/tests/Bug_2560_Regression/server.cpp b/TAO/tests/Bug_2560_Regression/server.cpp index 83c7f8c47a0..c7011f548d0 100644 --- a/TAO/tests/Bug_2560_Regression/server.cpp +++ b/TAO/tests/Bug_2560_Regression/server.cpp @@ -96,7 +96,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) orb->run (timeout); // Destroy the POA, waiting until the destruction terminates - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } catch (const CORBA::Exception & e) { diff --git a/TAO/tests/Bug_2593_Regression/server.cpp b/TAO/tests/Bug_2593_Regression/server.cpp index ec51b6fbc2f..7767662bb20 100644 --- a/TAO/tests/Bug_2593_Regression/server.cpp +++ b/TAO/tests/Bug_2593_Regression/server.cpp @@ -88,7 +88,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Bug_2595_Regression/server.cpp b/TAO/tests/Bug_2595_Regression/server.cpp index 93f0474ab01..f25f9398edb 100644 --- a/TAO/tests/Bug_2595_Regression/server.cpp +++ b/TAO/tests/Bug_2595_Regression/server.cpp @@ -88,7 +88,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Bug_2654_Regression/server.cpp b/TAO/tests/Bug_2654_Regression/server.cpp index ea5b34d568f..b5c839084c8 100644 --- a/TAO/tests/Bug_2654_Regression/server.cpp +++ b/TAO/tests/Bug_2654_Regression/server.cpp @@ -120,7 +120,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // implementation. ACE_Thread_Manager::instance()->wait(); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Bug_2768_Regression/server.cpp b/TAO/tests/Bug_2768_Regression/server.cpp index abb88e86bc9..de073456bda 100644 --- a/TAO/tests/Bug_2768_Regression/server.cpp +++ b/TAO/tests/Bug_2768_Regression/server.cpp @@ -79,7 +79,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - poa->destroy (1, 1); + poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Bug_2804_Regression/server.cpp b/TAO/tests/Bug_2804_Regression/server.cpp index 93f0474ab01..f25f9398edb 100644 --- a/TAO/tests/Bug_2804_Regression/server.cpp +++ b/TAO/tests/Bug_2804_Regression/server.cpp @@ -88,7 +88,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Bug_2805_Regression/client.cpp b/TAO/tests/Bug_2805_Regression/client.cpp index a038b164012..19cffd46fb1 100644 --- a/TAO/tests/Bug_2805_Regression/client.cpp +++ b/TAO/tests/Bug_2805_Regression/client.cpp @@ -271,8 +271,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "threads finished\n")); - root_poa->destroy (1, // ethernalize objects - 0); // wait for completion + root_poa->destroy (true, // ethernalize objects + false); // wait for completion orb->destroy (); } diff --git a/TAO/tests/Bug_2844_Regression/server.cpp b/TAO/tests/Bug_2844_Regression/server.cpp index 93f0474ab01..f25f9398edb 100644 --- a/TAO/tests/Bug_2844_Regression/server.cpp +++ b/TAO/tests/Bug_2844_Regression/server.cpp @@ -88,7 +88,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Bug_2909_Regression/client.cpp b/TAO/tests/Bug_2909_Regression/client.cpp index 9c9b02e239f..ccdafd2ecb5 100644 --- a/TAO/tests/Bug_2909_Regression/client.cpp +++ b/TAO/tests/Bug_2909_Regression/client.cpp @@ -254,8 +254,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "threads finished\n")); - root_poa->destroy (1, // ethernalize objects - 0); // wait for completion + root_poa->destroy (true, // ethernalize objects + false); // wait for completion orb->destroy (); } diff --git a/TAO/tests/Bug_2918_Regression/server.cpp b/TAO/tests/Bug_2918_Regression/server.cpp index 93f0474ab01..f25f9398edb 100644 --- a/TAO/tests/Bug_2918_Regression/server.cpp +++ b/TAO/tests/Bug_2918_Regression/server.cpp @@ -88,7 +88,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Bug_2966_Regression/server.cpp b/TAO/tests/Bug_2966_Regression/server.cpp index 4f2e61f69b7..cd084c89dc0 100644 --- a/TAO/tests/Bug_2966_Regression/server.cpp +++ b/TAO/tests/Bug_2966_Regression/server.cpp @@ -86,7 +86,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Bug_3000_Regression/client.cpp b/TAO/tests/Bug_3000_Regression/client.cpp index 27d150fe725..f584cc96ec3 100644 --- a/TAO/tests/Bug_3000_Regression/client.cpp +++ b/TAO/tests/Bug_3000_Regression/client.cpp @@ -131,7 +131,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) service->shutdown (); } - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Bug_3000_Regression/server.cpp b/TAO/tests/Bug_3000_Regression/server.cpp index ae8f1ce7f4f..5280034874c 100644 --- a/TAO/tests/Bug_3000_Regression/server.cpp +++ b/TAO/tests/Bug_3000_Regression/server.cpp @@ -114,7 +114,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "Event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Bug_3068_Regression/client.cpp b/TAO/tests/Bug_3068_Regression/client.cpp index c817077c2e1..6ec734c7772 100644 --- a/TAO/tests/Bug_3068_Regression/client.cpp +++ b/TAO/tests/Bug_3068_Regression/client.cpp @@ -137,7 +137,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_OS::abort (); } - root_poa->destroy (1, 1); + root_poa->destroy (true, true); } catch (const CORBA::Exception &excep) { diff --git a/TAO/tests/Bug_3068_Regression/server.cpp b/TAO/tests/Bug_3068_Regression/server.cpp index d4a2360714f..b6c71320485 100644 --- a/TAO/tests/Bug_3068_Regression/server.cpp +++ b/TAO/tests/Bug_3068_Regression/server.cpp @@ -119,7 +119,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_Thread_Manager::instance ()->wait (); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); } catch (const CORBA::Exception &excep) { diff --git a/TAO/tests/Bug_3108_Regression/server.cpp b/TAO/tests/Bug_3108_Regression/server.cpp index 1e735fe9441..37a10f7eeab 100644 --- a/TAO/tests/Bug_3108_Regression/server.cpp +++ b/TAO/tests/Bug_3108_Regression/server.cpp @@ -88,7 +88,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Bug_3163_Regression/server.cpp b/TAO/tests/Bug_3163_Regression/server.cpp index 12a05b1cff3..98b0ee8494e 100644 --- a/TAO/tests/Bug_3163_Regression/server.cpp +++ b/TAO/tests/Bug_3163_Regression/server.cpp @@ -114,7 +114,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) orb->run(); ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Bug_3299_Regression/server.cpp b/TAO/tests/Bug_3299_Regression/server.cpp index a29e11b9700..f527f504203 100644 --- a/TAO/tests/Bug_3299_Regression/server.cpp +++ b/TAO/tests/Bug_3299_Regression/server.cpp @@ -108,7 +108,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Bug_3333_Regression/server.cpp b/TAO/tests/Bug_3333_Regression/server.cpp index 04db89bf0cb..d04f2c7b19f 100644 --- a/TAO/tests/Bug_3333_Regression/server.cpp +++ b/TAO/tests/Bug_3333_Regression/server.cpp @@ -130,7 +130,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Bug_3384_Regression/server.cpp b/TAO/tests/Bug_3384_Regression/server.cpp index 2c3909bbd65..88f9948a5f0 100644 --- a/TAO/tests/Bug_3384_Regression/server.cpp +++ b/TAO/tests/Bug_3384_Regression/server.cpp @@ -110,7 +110,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Bug_3430_Regression/server.cpp b/TAO/tests/Bug_3430_Regression/server.cpp index 128457baeb9..ae09624b8a5 100644 --- a/TAO/tests/Bug_3430_Regression/server.cpp +++ b/TAO/tests/Bug_3430_Regression/server.cpp @@ -85,7 +85,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Bug_3471_Regression/server.cpp b/TAO/tests/Bug_3471_Regression/server.cpp index 128457baeb9..ae09624b8a5 100644 --- a/TAO/tests/Bug_3471_Regression/server.cpp +++ b/TAO/tests/Bug_3471_Regression/server.cpp @@ -85,7 +85,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Bug_3479_Regression/server.cpp b/TAO/tests/Bug_3479_Regression/server.cpp index 128457baeb9..ae09624b8a5 100644 --- a/TAO/tests/Bug_3479_Regression/server.cpp +++ b/TAO/tests/Bug_3479_Regression/server.cpp @@ -85,7 +85,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Bug_3524_Regression/server.cpp b/TAO/tests/Bug_3524_Regression/server.cpp index 5f7bebdef93..fc3a819c724 100644 --- a/TAO/tests/Bug_3524_Regression/server.cpp +++ b/TAO/tests/Bug_3524_Regression/server.cpp @@ -106,7 +106,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("event loop finished\n"))); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Bug_3543_Regression/master.cpp b/TAO/tests/Bug_3543_Regression/master.cpp index 97d4d2f25b7..37d1cd17cc4 100644 --- a/TAO/tests/Bug_3543_Regression/master.cpp +++ b/TAO/tests/Bug_3543_Regression/master.cpp @@ -254,7 +254,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) servers.clear (); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); diff --git a/TAO/tests/Bug_3543_Regression/server.cpp b/TAO/tests/Bug_3543_Regression/server.cpp index e6365206e2e..56865da0b98 100644 --- a/TAO/tests/Bug_3543_Regression/server.cpp +++ b/TAO/tests/Bug_3543_Regression/server.cpp @@ -87,7 +87,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Bug_3553_Regression/Bug_3553_Regression_server.cpp b/TAO/tests/Bug_3553_Regression/Bug_3553_Regression_server.cpp index eece267d31f..03804c90c66 100644 --- a/TAO/tests/Bug_3553_Regression/Bug_3553_Regression_server.cpp +++ b/TAO/tests/Bug_3553_Regression/Bug_3553_Regression_server.cpp @@ -82,7 +82,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Bug_3558_Regression/server.cpp b/TAO/tests/Bug_3558_Regression/server.cpp index 4e60c24483f..755c7718c1d 100644 --- a/TAO/tests/Bug_3558_Regression/server.cpp +++ b/TAO/tests/Bug_3558_Regression/server.cpp @@ -85,7 +85,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Bug_3567_Regression/client.cpp b/TAO/tests/Bug_3567_Regression/client.cpp index 76acc2af742..5f5ed1c9e56 100644 --- a/TAO/tests/Bug_3567_Regression/client.cpp +++ b/TAO/tests/Bug_3567_Regression/client.cpp @@ -296,8 +296,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) server->shutdown (); - root_poa->destroy (1, // ethernalize objects - 0); // wait for completion + root_poa->destroy (true, // ethernalize objects + false); // wait for completion orb->destroy (); } diff --git a/TAO/tests/Bug_3567_Regression/server.cpp b/TAO/tests/Bug_3567_Regression/server.cpp index 153766723e3..63e4c806ef1 100644 --- a/TAO/tests/Bug_3567_Regression/server.cpp +++ b/TAO/tests/Bug_3567_Regression/server.cpp @@ -131,8 +131,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) worker.thr_mgr ()->wait (); - root_poa->destroy (1, // ethernalize objects - 0); // wait for completion + root_poa->destroy (true, // ethernalize objects + false); // wait for completion orb->destroy (); diff --git a/TAO/tests/Bug_3598a_Regression/server.cpp b/TAO/tests/Bug_3598a_Regression/server.cpp index f951982118f..edb8c8fe14c 100644 --- a/TAO/tests/Bug_3598a_Regression/server.cpp +++ b/TAO/tests/Bug_3598a_Regression/server.cpp @@ -79,7 +79,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - root_poa->destroy (1, 1 ); + root_poa->destroy (1, 1); orb->destroy (); diff --git a/TAO/tests/Bug_3647_Regression/backend_server.cpp b/TAO/tests/Bug_3647_Regression/backend_server.cpp index a2b8acf6003..85ed4b49a45 100644 --- a/TAO/tests/Bug_3647_Regression/backend_server.cpp +++ b/TAO/tests/Bug_3647_Regression/backend_server.cpp @@ -96,7 +96,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "backend_server(%P|%t) - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Bug_3647_Regression/middle_server.cpp b/TAO/tests/Bug_3647_Regression/middle_server.cpp index 64f66ec17a1..3c19504187c 100644 --- a/TAO/tests/Bug_3647_Regression/middle_server.cpp +++ b/TAO/tests/Bug_3647_Regression/middle_server.cpp @@ -199,7 +199,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "middle_server(%P|%t) - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Bug_3672_Regression/client.cpp b/TAO/tests/Bug_3672_Regression/client.cpp index 88a2f8aa8dd..6e604fc1de7 100644 --- a/TAO/tests/Bug_3672_Regression/client.cpp +++ b/TAO/tests/Bug_3672_Regression/client.cpp @@ -235,8 +235,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) orb->run (tv); root_poa->deactivate_object (id.in ()); - root_poa->destroy (1, // ethernalize objects - 0); // wait for completion + root_poa->destroy (true, // ethernalize objects + false); // wait for completion hello = A::AMI_AMI_TestHandler::_nil (); root_poa = PortableServer::POA::_nil (); diff --git a/TAO/tests/Bug_3672_Regression/server.cpp b/TAO/tests/Bug_3672_Regression/server.cpp index f67a367ce08..7a101f596bf 100644 --- a/TAO/tests/Bug_3672_Regression/server.cpp +++ b/TAO/tests/Bug_3672_Regression/server.cpp @@ -103,8 +103,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) orb->run (); - root_poa->destroy (1, // ethernalize objects - 0); // wait for completion + root_poa->destroy (true, // ethernalize objects + false); // wait for completion orb->destroy (); diff --git a/TAO/tests/Bug_3676_Regression/server.cpp b/TAO/tests/Bug_3676_Regression/server.cpp index 128457baeb9..ae09624b8a5 100644 --- a/TAO/tests/Bug_3676_Regression/server.cpp +++ b/TAO/tests/Bug_3676_Regression/server.cpp @@ -85,7 +85,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Bug_3746_Regression/server.cpp b/TAO/tests/Bug_3746_Regression/server.cpp index 4386d4f89a2..a361ff8697a 100644 --- a/TAO/tests/Bug_3746_Regression/server.cpp +++ b/TAO/tests/Bug_3746_Regression/server.cpp @@ -92,7 +92,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "Server - Event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Bug_3748_Regression/server.cpp b/TAO/tests/Bug_3748_Regression/server.cpp index 77e3721d623..424e4901dcc 100644 --- a/TAO/tests/Bug_3748_Regression/server.cpp +++ b/TAO/tests/Bug_3748_Regression/server.cpp @@ -95,7 +95,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } catch (const CORBA::Exception& ex) diff --git a/TAO/tests/Bug_3766_Regression/server.cpp b/TAO/tests/Bug_3766_Regression/server.cpp index a0785ac0311..649d9584355 100644 --- a/TAO/tests/Bug_3766_Regression/server.cpp +++ b/TAO/tests/Bug_3766_Regression/server.cpp @@ -85,7 +85,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Bug_3768_Regression/server.cpp b/TAO/tests/Bug_3768_Regression/server.cpp index 946fe2d03ef..2cdabc37c7d 100644 --- a/TAO/tests/Bug_3768_Regression/server.cpp +++ b/TAO/tests/Bug_3768_Regression/server.cpp @@ -125,7 +125,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) work.wait (); // wait for the worker to finish - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Bug_3790_Regression/server.cpp b/TAO/tests/Bug_3790_Regression/server.cpp index 80f2e8df786..6e24a872498 100644 --- a/TAO/tests/Bug_3790_Regression/server.cpp +++ b/TAO/tests/Bug_3790_Regression/server.cpp @@ -86,7 +86,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "Server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Bug_3801_Regression/server.cpp b/TAO/tests/Bug_3801_Regression/server.cpp index f67a367ce08..7a101f596bf 100644 --- a/TAO/tests/Bug_3801_Regression/server.cpp +++ b/TAO/tests/Bug_3801_Regression/server.cpp @@ -103,8 +103,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) orb->run (); - root_poa->destroy (1, // ethernalize objects - 0); // wait for completion + root_poa->destroy (true, // ethernalize objects + false); // wait for completion orb->destroy (); diff --git a/TAO/tests/Bug_3837_Regression/server.cpp b/TAO/tests/Bug_3837_Regression/server.cpp index 2959b24a3cc..37c276f9222 100644 --- a/TAO/tests/Bug_3837_Regression/server.cpp +++ b/TAO/tests/Bug_3837_Regression/server.cpp @@ -85,7 +85,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Bug_3896_Regression/server.cpp b/TAO/tests/Bug_3896_Regression/server.cpp index 128457baeb9..ae09624b8a5 100644 --- a/TAO/tests/Bug_3896_Regression/server.cpp +++ b/TAO/tests/Bug_3896_Regression/server.cpp @@ -85,7 +85,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Bug_3919_Regression/server.cpp b/TAO/tests/Bug_3919_Regression/server.cpp index 93f0474ab01..f25f9398edb 100644 --- a/TAO/tests/Bug_3919_Regression/server.cpp +++ b/TAO/tests/Bug_3919_Regression/server.cpp @@ -88,7 +88,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Bug_3926_Regression/server.cpp b/TAO/tests/Bug_3926_Regression/server.cpp index 14719cd5a44..d72856f4593 100644 --- a/TAO/tests/Bug_3926_Regression/server.cpp +++ b/TAO/tests/Bug_3926_Regression/server.cpp @@ -91,7 +91,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // Run the ORB event loop. orb->run (); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); diff --git a/TAO/tests/Bug_3953_Regression/client.cpp b/TAO/tests/Bug_3953_Regression/client.cpp index d28e168eedf..ada0a335e0d 100644 --- a/TAO/tests/Bug_3953_Regression/client.cpp +++ b/TAO/tests/Bug_3953_Regression/client.cpp @@ -154,7 +154,7 @@ ACE_TMAIN (int argc, server->shutdown (); } - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Bug_3953_Regression/server.cpp b/TAO/tests/Bug_3953_Regression/server.cpp index 3480610622f..fc00327e5f5 100644 --- a/TAO/tests/Bug_3953_Regression/server.cpp +++ b/TAO/tests/Bug_3953_Regression/server.cpp @@ -181,7 +181,7 @@ ACE_TMAIN (int argc, ACE_TCHAR **argv) if (result != 0) return result; - root_poa->destroy (1, 1); + root_poa->destroy (true, true); if (!server_servant.exception ()) ++result; diff --git a/TAO/tests/Bug_3954_Regression/server.cpp b/TAO/tests/Bug_3954_Regression/server.cpp index 128457baeb9..ae09624b8a5 100644 --- a/TAO/tests/Bug_3954_Regression/server.cpp +++ b/TAO/tests/Bug_3954_Regression/server.cpp @@ -85,7 +85,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Bug_4010_Regression/server.cpp b/TAO/tests/Bug_4010_Regression/server.cpp index 128457baeb9..ae09624b8a5 100644 --- a/TAO/tests/Bug_4010_Regression/server.cpp +++ b/TAO/tests/Bug_4010_Regression/server.cpp @@ -85,7 +85,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Bug_4059_Regression/server.cpp b/TAO/tests/Bug_4059_Regression/server.cpp index 51d27ad8557..6521ac3b6cd 100644 --- a/TAO/tests/Bug_4059_Regression/server.cpp +++ b/TAO/tests/Bug_4059_Regression/server.cpp @@ -95,7 +95,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Bug_4213_Regression/server.cpp b/TAO/tests/Bug_4213_Regression/server.cpp index 8a476508f3e..29f0ce87fc0 100644 --- a/TAO/tests/Bug_4213_Regression/server.cpp +++ b/TAO/tests/Bug_4213_Regression/server.cpp @@ -99,7 +99,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/CORBA_e_Implicit_Activation/server.cpp b/TAO/tests/CORBA_e_Implicit_Activation/server.cpp index d8d1b94047d..21efcd28621 100644 --- a/TAO/tests/CORBA_e_Implicit_Activation/server.cpp +++ b/TAO/tests/CORBA_e_Implicit_Activation/server.cpp @@ -32,7 +32,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) "ERROR: Implicit activation should have " "thrown an exception with CORBA e compact.\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } catch (const PortableServer::POA::WrongPolicy&) diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/server.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/server.cpp index f403566be8e..60dce591922 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/server.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/server.cpp @@ -90,7 +90,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); diff --git a/TAO/tests/Cache_Growth_Test/server.cpp b/TAO/tests/Cache_Growth_Test/server.cpp index 61d29a4267f..cfa014f5d3b 100644 --- a/TAO/tests/Cache_Growth_Test/server.cpp +++ b/TAO/tests/Cache_Growth_Test/server.cpp @@ -88,7 +88,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/CallbackTest/client.cpp b/TAO/tests/CallbackTest/client.cpp index 23cb32f14c8..0a7c35f1712 100644 --- a/TAO/tests/CallbackTest/client.cpp +++ b/TAO/tests/CallbackTest/client.cpp @@ -120,7 +120,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) orb->run (); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/CallbackTest/server.cpp b/TAO/tests/CallbackTest/server.cpp index f22b679fb08..260a8053003 100644 --- a/TAO/tests/CallbackTest/server.cpp +++ b/TAO/tests/CallbackTest/server.cpp @@ -116,7 +116,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) service_impl->dump_results (); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/ClientPortSpan/server.cpp b/TAO/tests/ClientPortSpan/server.cpp index 128457baeb9..ae09624b8a5 100644 --- a/TAO/tests/ClientPortSpan/server.cpp +++ b/TAO/tests/ClientPortSpan/server.cpp @@ -85,7 +85,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Client_Leaks/child.cpp b/TAO/tests/Client_Leaks/child.cpp index 77152ee162e..7e97d72bacd 100644 --- a/TAO/tests/Client_Leaks/child.cpp +++ b/TAO/tests/Client_Leaks/child.cpp @@ -66,7 +66,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_Time_Value tv (50, 0); orb->run (tv); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Client_Leaks/server.cpp b/TAO/tests/Client_Leaks/server.cpp index 18006da3b87..cac76417c74 100644 --- a/TAO/tests/Client_Leaks/server.cpp +++ b/TAO/tests/Client_Leaks/server.cpp @@ -95,7 +95,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/CodeSets/simple/server.cpp b/TAO/tests/CodeSets/simple/server.cpp index 0076baf6e29..efe705de3ad 100644 --- a/TAO/tests/CodeSets/simple/server.cpp +++ b/TAO/tests/CodeSets/simple/server.cpp @@ -162,7 +162,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) // Wait for calls orb->run (); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Collocated_Forwarding/server.cpp b/TAO/tests/Collocated_Forwarding/server.cpp index 5947960f668..7328ee29ef7 100644 --- a/TAO/tests/Collocated_Forwarding/server.cpp +++ b/TAO/tests/Collocated_Forwarding/server.cpp @@ -140,7 +140,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) test_colocal (server.in ()); } - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); diff --git a/TAO/tests/Collocation_Exception_Test/Server_Task.cpp b/TAO/tests/Collocation_Exception_Test/Server_Task.cpp index 57680cb8ed3..ebe3075b8fc 100644 --- a/TAO/tests/Collocation_Exception_Test/Server_Task.cpp +++ b/TAO/tests/Collocation_Exception_Test/Server_Task.cpp @@ -74,7 +74,7 @@ Server_Task::svc (void) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); this->sorb_->destroy (); } diff --git a/TAO/tests/Collocation_Oneway_Tests/Server_Task.cpp b/TAO/tests/Collocation_Oneway_Tests/Server_Task.cpp index 21c1e58bfc2..95cb690e576 100644 --- a/TAO/tests/Collocation_Oneway_Tests/Server_Task.cpp +++ b/TAO/tests/Collocation_Oneway_Tests/Server_Task.cpp @@ -74,7 +74,7 @@ Server_Task::svc (void) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); this->sorb_->destroy (); } diff --git a/TAO/tests/Connect_Strategy_Test/server.cpp b/TAO/tests/Connect_Strategy_Test/server.cpp index 93f0474ab01..f25f9398edb 100644 --- a/TAO/tests/Connect_Strategy_Test/server.cpp +++ b/TAO/tests/Connect_Strategy_Test/server.cpp @@ -88,7 +88,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Connection_Purging/server.cpp b/TAO/tests/Connection_Purging/server.cpp index f39194018c4..db7752ed258 100644 --- a/TAO/tests/Connection_Purging/server.cpp +++ b/TAO/tests/Connection_Purging/server.cpp @@ -89,7 +89,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); delete test_impl; - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Crash_On_Write/server.cpp b/TAO/tests/Crash_On_Write/server.cpp index 5d730cba5bd..ce2317cc80f 100644 --- a/TAO/tests/Crash_On_Write/server.cpp +++ b/TAO/tests/Crash_On_Write/server.cpp @@ -98,7 +98,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) /*NOTREACHED*/ ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Crashed_Callback/client.cpp b/TAO/tests/Crashed_Callback/client.cpp index ba0ad2c43d0..6d730317b1f 100644 --- a/TAO/tests/Crashed_Callback/client.cpp +++ b/TAO/tests/Crashed_Callback/client.cpp @@ -114,7 +114,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) orb->run (); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Crashed_Callback/server.cpp b/TAO/tests/Crashed_Callback/server.cpp index a56060e900c..7d332f1d7ed 100644 --- a/TAO/tests/Crashed_Callback/server.cpp +++ b/TAO/tests/Crashed_Callback/server.cpp @@ -119,7 +119,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) service_impl->dump_results (); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/DII_Deferred_Transient/server.cpp b/TAO/tests/DII_Deferred_Transient/server.cpp index 74558b8e9fe..6f3d9c0e3c9 100644 --- a/TAO/tests/DII_Deferred_Transient/server.cpp +++ b/TAO/tests/DII_Deferred_Transient/server.cpp @@ -86,7 +86,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/DII_Discard_Deferred/server.cpp b/TAO/tests/DII_Discard_Deferred/server.cpp index 4f2e61f69b7..cd084c89dc0 100644 --- a/TAO/tests/DII_Discard_Deferred/server.cpp +++ b/TAO/tests/DII_Discard_Deferred/server.cpp @@ -86,7 +86,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/DIOP/client.cpp b/TAO/tests/DIOP/client.cpp index d5fcb88a4c0..2a635b9ecc7 100644 --- a/TAO/tests/DIOP/client.cpp +++ b/TAO/tests/DIOP/client.cpp @@ -133,8 +133,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - root_poa->destroy (1, // ethernalize objects - 0); // wait for completion + root_poa->destroy (true, // ethernalize objects + false); // wait for completion orb->destroy (); diff --git a/TAO/tests/DIOP/server.cpp b/TAO/tests/DIOP/server.cpp index 350b1b0a32a..e1ba8b5ff02 100644 --- a/TAO/tests/DIOP/server.cpp +++ b/TAO/tests/DIOP/server.cpp @@ -138,8 +138,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - root_poa->destroy (1, // ethernalize objects - 0); // wait for completion + root_poa->destroy (true, // ethernalize objects + false); // wait for completion orb->destroy (); } diff --git a/TAO/tests/DSI_AMH/server.cpp b/TAO/tests/DSI_AMH/server.cpp index a52236a4c9f..d1af1d016ed 100644 --- a/TAO/tests/DSI_AMH/server.cpp +++ b/TAO/tests/DSI_AMH/server.cpp @@ -86,7 +86,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/DiffServ/server.cpp b/TAO/tests/DiffServ/server.cpp index 778d72a4351..138e4d77c3f 100644 --- a/TAO/tests/DiffServ/server.cpp +++ b/TAO/tests/DiffServ/server.cpp @@ -204,7 +204,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "Server ORB event loop finished\n\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/DynAny_Test/data.cpp b/TAO/tests/DynAny_Test/data.cpp index 216a6c6d444..437237b123f 100644 --- a/TAO/tests/DynAny_Test/data.cpp +++ b/TAO/tests/DynAny_Test/data.cpp @@ -89,11 +89,8 @@ Data::Data (CORBA::ORB_var orb) this->m_objref2 = root_poa->create_reference ("foo"); - // Clean up after the POA - root_poa->destroy (1, - 1); - + root_poa->destroy (1, 1); } catch (const CORBA::Exception& ex) { diff --git a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/server.cpp b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/server.cpp index 45040fd3c7f..e31abbae306 100644 --- a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/server.cpp +++ b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/server.cpp @@ -109,7 +109,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) // Wait for all CSD task threads exit. ACE_Thread_Manager::instance ()->wait (); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); diff --git a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/server.cpp b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/server.cpp index 387d7b39413..8a860e19ad8 100644 --- a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/server.cpp +++ b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/server.cpp @@ -187,7 +187,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) // Wait for all CSD task threads exit. ACE_Thread_Manager::instance ()->wait (); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); diff --git a/TAO/tests/Faults/client.cpp b/TAO/tests/Faults/client.cpp index ec32b46fa2a..8d12a41c115 100644 --- a/TAO/tests/Faults/client.cpp +++ b/TAO/tests/Faults/client.cpp @@ -167,7 +167,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) server->shutdown (); } - root_poa->destroy (1, 1); + root_poa->destroy (true, true); } catch (const CORBA::COMM_FAILURE& x) diff --git a/TAO/tests/Faults/middle.cpp b/TAO/tests/Faults/middle.cpp index 889f297e491..ae995dcc6c6 100644 --- a/TAO/tests/Faults/middle.cpp +++ b/TAO/tests/Faults/middle.cpp @@ -121,7 +121,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "middle - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); } catch (const CORBA::Exception& ex) diff --git a/TAO/tests/Faults/ping.cpp b/TAO/tests/Faults/ping.cpp index ae6a6a137d3..3e068a19d50 100644 --- a/TAO/tests/Faults/ping.cpp +++ b/TAO/tests/Faults/ping.cpp @@ -108,9 +108,9 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "ping - event loop finished\n")); - persistent_poa->destroy (1, 1); + persistent_poa->destroy (true, true); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); } catch (const CORBA::Exception& ex) { diff --git a/TAO/tests/Faults/pong.cpp b/TAO/tests/Faults/pong.cpp index cdbc5dec585..207d54190ee 100644 --- a/TAO/tests/Faults/pong.cpp +++ b/TAO/tests/Faults/pong.cpp @@ -171,9 +171,9 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) server.in (), callback.in ()); - persistent_poa->destroy (1, 1); + persistent_poa->destroy (true, true); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); } catch (const CORBA::Exception& ex) { diff --git a/TAO/tests/Faults/server.cpp b/TAO/tests/Faults/server.cpp index 14b151a399d..cefe2b0c62a 100644 --- a/TAO/tests/Faults/server.cpp +++ b/TAO/tests/Faults/server.cpp @@ -97,7 +97,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); } catch (const CORBA::Exception& ex) { diff --git a/TAO/tests/ForwardUponObjectNotExist/server.cpp b/TAO/tests/ForwardUponObjectNotExist/server.cpp index e9a267ec27b..f401d1cbb22 100644 --- a/TAO/tests/ForwardUponObjectNotExist/server.cpp +++ b/TAO/tests/ForwardUponObjectNotExist/server.cpp @@ -96,7 +96,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t)server: event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/GIOP_Fragments/Java_Big_Request/server.cpp b/TAO/tests/GIOP_Fragments/Java_Big_Request/server.cpp index 687b2096ddd..af6a1bd608d 100644 --- a/TAO/tests/GIOP_Fragments/Java_Big_Request/server.cpp +++ b/TAO/tests/GIOP_Fragments/Java_Big_Request/server.cpp @@ -95,7 +95,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ++status; } - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/server.cpp b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/server.cpp index db3aa9c564d..3af2e7cf8e0 100644 --- a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/server.cpp +++ b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/server.cpp @@ -104,7 +104,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ++status; } - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Hang_Shutdown/server.cpp b/TAO/tests/Hang_Shutdown/server.cpp index 03193adec64..2a4975eb194 100644 --- a/TAO/tests/Hang_Shutdown/server.cpp +++ b/TAO/tests/Hang_Shutdown/server.cpp @@ -95,7 +95,7 @@ namespace Test ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Hello/server.cpp b/TAO/tests/Hello/server.cpp index 128457baeb9..ae09624b8a5 100644 --- a/TAO/tests/Hello/server.cpp +++ b/TAO/tests/Hello/server.cpp @@ -85,7 +85,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/ICMG_Any_Bug/server.cpp b/TAO/tests/ICMG_Any_Bug/server.cpp index c2749ef789c..219e4ab0e91 100644 --- a/TAO/tests/ICMG_Any_Bug/server.cpp +++ b/TAO/tests/ICMG_Any_Bug/server.cpp @@ -88,7 +88,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/IORManipulation/filter/server.cpp b/TAO/tests/IORManipulation/filter/server.cpp index 99f4062fd55..a27a528d62a 100644 --- a/TAO/tests/IORManipulation/filter/server.cpp +++ b/TAO/tests/IORManipulation/filter/server.cpp @@ -67,7 +67,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) status++; } - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/IORTable_Locator/async_server.cpp b/TAO/tests/IORTable_Locator/async_server.cpp index 9c7f7d49b39..1d45f3e2984 100644 --- a/TAO/tests/IORTable_Locator/async_server.cpp +++ b/TAO/tests/IORTable_Locator/async_server.cpp @@ -188,7 +188,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Server - event loop finished\n"))); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/IORTable_Locator/server.cpp b/TAO/tests/IORTable_Locator/server.cpp index 0cc4dd853d3..6b4e9e418d0 100644 --- a/TAO/tests/IORTable_Locator/server.cpp +++ b/TAO/tests/IORTable_Locator/server.cpp @@ -100,7 +100,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "Server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/IPV6/server.cpp b/TAO/tests/IPV6/server.cpp index 93f0474ab01..f25f9398edb 100644 --- a/TAO/tests/IPV6/server.cpp +++ b/TAO/tests/IPV6/server.cpp @@ -88,7 +88,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Leader_Followers/server.cpp b/TAO/tests/Leader_Followers/server.cpp index 8416a589990..72f9cf8ccd3 100644 --- a/TAO/tests/Leader_Followers/server.cpp +++ b/TAO/tests/Leader_Followers/server.cpp @@ -129,8 +129,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "Server: Event loop finished\n")); - root_poa->destroy (1, - 1); + root_poa->destroy (1, 1); } catch (const CORBA::Exception& ex) { diff --git a/TAO/tests/LongDouble/server.cpp b/TAO/tests/LongDouble/server.cpp index 4e7ac85131c..78d2bdb452d 100644 --- a/TAO/tests/LongDouble/server.cpp +++ b/TAO/tests/LongDouble/server.cpp @@ -86,7 +86,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) orb->run (); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/LongUpcalls/ami_client.cpp b/TAO/tests/LongUpcalls/ami_client.cpp index 2d6e7732715..0875ce8afcb 100644 --- a/TAO/tests/LongUpcalls/ami_client.cpp +++ b/TAO/tests/LongUpcalls/ami_client.cpp @@ -99,7 +99,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) manager->shutdown (); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/LongUpcalls/ami_server.cpp b/TAO/tests/LongUpcalls/ami_server.cpp index 9d1c223557b..1bcf320ef34 100644 --- a/TAO/tests/LongUpcalls/ami_server.cpp +++ b/TAO/tests/LongUpcalls/ami_server.cpp @@ -82,7 +82,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/LongUpcalls/blocking_client.cpp b/TAO/tests/LongUpcalls/blocking_client.cpp index 38ad1df82b6..f72835cbcca 100644 --- a/TAO/tests/LongUpcalls/blocking_client.cpp +++ b/TAO/tests/LongUpcalls/blocking_client.cpp @@ -85,7 +85,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) manager->shutdown (); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/LongUpcalls/blocking_server.cpp b/TAO/tests/LongUpcalls/blocking_server.cpp index a024de4d280..13f24970e29 100644 --- a/TAO/tests/LongUpcalls/blocking_server.cpp +++ b/TAO/tests/LongUpcalls/blocking_server.cpp @@ -82,7 +82,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/MProfile/server.cpp b/TAO/tests/MProfile/server.cpp index 7ec816c36bb..8fd2a72a1b0 100644 --- a/TAO/tests/MProfile/server.cpp +++ b/TAO/tests/MProfile/server.cpp @@ -91,7 +91,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); ACE_OS::sleep (5); } diff --git a/TAO/tests/MProfile_Connection_Timeout/server.cpp b/TAO/tests/MProfile_Connection_Timeout/server.cpp index cecca0ee717..b8e6c1dc888 100644 --- a/TAO/tests/MProfile_Connection_Timeout/server.cpp +++ b/TAO/tests/MProfile_Connection_Timeout/server.cpp @@ -97,7 +97,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); } catch (const CORBA::Exception& ex) { diff --git a/TAO/tests/MProfile_Forwarding/server.cpp b/TAO/tests/MProfile_Forwarding/server.cpp index 5517ecf0093..196c9bb6b7a 100644 --- a/TAO/tests/MProfile_Forwarding/server.cpp +++ b/TAO/tests/MProfile_Forwarding/server.cpp @@ -91,7 +91,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); ACE_OS::sleep (5); } diff --git a/TAO/tests/MT_BiDir/client.cpp b/TAO/tests/MT_BiDir/client.cpp index 264e4098f8d..14056b16ec7 100644 --- a/TAO/tests/MT_BiDir/client.cpp +++ b/TAO/tests/MT_BiDir/client.cpp @@ -137,8 +137,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) "(%P|%t) Number of events received.. [%d]\n", count)); - root_poa->destroy (1, - 1); + root_poa->destroy (1, 1); } catch (const CORBA::Exception& ex) { diff --git a/TAO/tests/MT_BiDir/server.cpp b/TAO/tests/MT_BiDir/server.cpp index ce5b925c9e8..68a39ceda53 100644 --- a/TAO/tests/MT_BiDir/server.cpp +++ b/TAO/tests/MT_BiDir/server.cpp @@ -163,8 +163,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_Thread_Manager::instance ()->wait (); - root_poa->destroy (1, - 1); + root_poa->destroy (1, 1); } catch (const CORBA::Exception& ex) { diff --git a/TAO/tests/MT_Client/server.cpp b/TAO/tests/MT_Client/server.cpp index 3100cffb926..388e5d59067 100644 --- a/TAO/tests/MT_Client/server.cpp +++ b/TAO/tests/MT_Client/server.cpp @@ -88,7 +88,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/MT_Timeout/server.cpp b/TAO/tests/MT_Timeout/server.cpp index 6927fb9f275..994c9d7d644 100644 --- a/TAO/tests/MT_Timeout/server.cpp +++ b/TAO/tests/MT_Timeout/server.cpp @@ -96,7 +96,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Mixed_Sync_ASync_Events/main.cpp b/TAO/tests/Mixed_Sync_ASync_Events/main.cpp index 022d0812dba..b8f3f0697ba 100644 --- a/TAO/tests/Mixed_Sync_ASync_Events/main.cpp +++ b/TAO/tests/Mixed_Sync_ASync_Events/main.cpp @@ -165,9 +165,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) orb->run (); - root_poa->destroy (1, // ethernalize objects - 0 // wait for completion - ); + root_poa->destroy (true, // ethernalize objects + false); // wait for completion orb->destroy (); diff --git a/TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/server.cpp b/TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/server.cpp index 43d54b1dd5c..57eff37aa5d 100644 --- a/TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/server.cpp +++ b/TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/server.cpp @@ -99,7 +99,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/server.cpp b/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/server.cpp index 2be72bb5c4c..9d93f76d3f6 100644 --- a/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/server.cpp +++ b/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/server.cpp @@ -105,7 +105,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t)server: event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Muxing/server.cpp b/TAO/tests/Muxing/server.cpp index 99b5c23bd73..3f98cda6010 100644 --- a/TAO/tests/Muxing/server.cpp +++ b/TAO/tests/Muxing/server.cpp @@ -94,7 +94,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "Now terminating test\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/NestedUpcall/Simple/client.cpp b/TAO/tests/NestedUpcall/Simple/client.cpp index 7c6cbeaf6a4..9b2944ef75d 100644 --- a/TAO/tests/NestedUpcall/Simple/client.cpp +++ b/TAO/tests/NestedUpcall/Simple/client.cpp @@ -151,8 +151,7 @@ ACE_TMAIN (int argc, server->shutdown (); } - root_poa->destroy (1, - 1); + root_poa->destroy (1, 1); } catch (const CORBA::Exception& ex) { diff --git a/TAO/tests/NestedUpcall/Simple/server.cpp b/TAO/tests/NestedUpcall/Simple/server.cpp index 1f63d771f33..1aa13a59714 100644 --- a/TAO/tests/NestedUpcall/Simple/server.cpp +++ b/TAO/tests/NestedUpcall/Simple/server.cpp @@ -155,7 +155,7 @@ ACE_TMAIN (int argc, ACE_TCHAR **argv) if (result != 0) return result; - root_poa->destroy (1, 1); + root_poa->destroy (true, true); } catch (const CORBA::Exception& ex) { diff --git a/TAO/tests/NestedUpcall/Simple/simple-client.cpp b/TAO/tests/NestedUpcall/Simple/simple-client.cpp index 027c9993cb2..45c8083fa8c 100644 --- a/TAO/tests/NestedUpcall/Simple/simple-client.cpp +++ b/TAO/tests/NestedUpcall/Simple/simple-client.cpp @@ -159,8 +159,7 @@ ACT_TMAIN (int argc, ACE_TCHAR **argv) server->shutdown (); } - root_poa->destroy (1, - 1); + root_poa->destroy (1, 1); } catch (const CORBA::Exception& ex) { diff --git a/TAO/tests/Nested_Event_Loop/client.cpp b/TAO/tests/Nested_Event_Loop/client.cpp index 4c06f40fb06..8e3c828ff67 100644 --- a/TAO/tests/Nested_Event_Loop/client.cpp +++ b/TAO/tests/Nested_Event_Loop/client.cpp @@ -110,8 +110,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) server_object->shutdown (); } - root_poa->destroy (1, - 1); + root_poa->destroy (1, 1); } catch (const CORBA::Exception& ex) { diff --git a/TAO/tests/Nested_Event_Loop/server.cpp b/TAO/tests/Nested_Event_Loop/server.cpp index 53dc6f26297..61654b57cff 100644 --- a/TAO/tests/Nested_Event_Loop/server.cpp +++ b/TAO/tests/Nested_Event_Loop/server.cpp @@ -81,8 +81,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - root_poa->destroy (1, - 1); + root_poa->destroy (1, 1); orb->destroy (); } diff --git a/TAO/tests/Nested_Upcall_Crash/client.cpp b/TAO/tests/Nested_Upcall_Crash/client.cpp index f2127345363..f74dedb9d84 100644 --- a/TAO/tests/Nested_Upcall_Crash/client.cpp +++ b/TAO/tests/Nested_Upcall_Crash/client.cpp @@ -114,7 +114,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Nested_Upcall_Crash/server.cpp b/TAO/tests/Nested_Upcall_Crash/server.cpp index 47b5e700d19..b8e5c7ef555 100644 --- a/TAO/tests/Nested_Upcall_Crash/server.cpp +++ b/TAO/tests/Nested_Upcall_Crash/server.cpp @@ -120,7 +120,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/No_Server_MT_Connect_Test/server.cpp b/TAO/tests/No_Server_MT_Connect_Test/server.cpp index 3100cffb926..388e5d59067 100644 --- a/TAO/tests/No_Server_MT_Connect_Test/server.cpp +++ b/TAO/tests/No_Server_MT_Connect_Test/server.cpp @@ -88,7 +88,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/OBV/Any/server.cpp b/TAO/tests/OBV/Any/server.cpp index 5870e17a604..1f77334e2ca 100644 --- a/TAO/tests/OBV/Any/server.cpp +++ b/TAO/tests/OBV/Any/server.cpp @@ -91,7 +91,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished.\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/OBV/Collocated/Forward/Server_Task.cpp b/TAO/tests/OBV/Collocated/Forward/Server_Task.cpp index dc13599e2c7..fd02bf6fec2 100644 --- a/TAO/tests/OBV/Collocated/Forward/Server_Task.cpp +++ b/TAO/tests/OBV/Collocated/Forward/Server_Task.cpp @@ -106,7 +106,7 @@ Server_Task::svc (void) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); this->sorb_->destroy (); } diff --git a/TAO/tests/OBV/Factory/server.cpp b/TAO/tests/OBV/Factory/server.cpp index 1eb6fa98891..d5e82cea954 100644 --- a/TAO/tests/OBV/Factory/server.cpp +++ b/TAO/tests/OBV/Factory/server.cpp @@ -89,7 +89,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/OBV/Forward/server.cpp b/TAO/tests/OBV/Forward/server.cpp index b809ee50eac..85e0d013af2 100644 --- a/TAO/tests/OBV/Forward/server.cpp +++ b/TAO/tests/OBV/Forward/server.cpp @@ -127,7 +127,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/OBV/TC_Alignment/server.cpp b/TAO/tests/OBV/TC_Alignment/server.cpp index 5a7d3f136d2..2b493f40591 100644 --- a/TAO/tests/OBV/TC_Alignment/server.cpp +++ b/TAO/tests/OBV/TC_Alignment/server.cpp @@ -98,7 +98,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) orb->run (); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); } catch (const CORBA::Exception& ex) { diff --git a/TAO/tests/OBV/Truncatable/server.cpp b/TAO/tests/OBV/Truncatable/server.cpp index 26188c43b84..b4ab6216c59 100644 --- a/TAO/tests/OBV/Truncatable/server.cpp +++ b/TAO/tests/OBV/Truncatable/server.cpp @@ -126,7 +126,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/OBV/ValueBox/server.cpp b/TAO/tests/OBV/ValueBox/server.cpp index 88c3cab228f..31572c07431 100644 --- a/TAO/tests/OBV/ValueBox/server.cpp +++ b/TAO/tests/OBV/ValueBox/server.cpp @@ -89,7 +89,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/server.cpp b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/server.cpp index 98caf3d4143..dec8a68995a 100644 --- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/server.cpp +++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/server.cpp @@ -110,7 +110,7 @@ Server_Worker::test_main (int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Server exiting the event loop\n"))); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); // During normal test execution the ORB would have been destroyed // by a request from the client. diff --git a/TAO/tests/ORB_destroy/ORB_destroy.cpp b/TAO/tests/ORB_destroy/ORB_destroy.cpp index f000ecf4bd7..b27c41c88ee 100644 --- a/TAO/tests/ORB_destroy/ORB_destroy.cpp +++ b/TAO/tests/ORB_destroy/ORB_destroy.cpp @@ -41,7 +41,7 @@ test_with_regular_poa_manager (int argc, if (destroy_poa) { - root_poa->destroy (1, 1); + root_poa->destroy (true, true); } if (destroy_orb) @@ -87,7 +87,7 @@ test_with_funky_poa_manager (int argc, if (destroy_poa) { - root_poa->destroy (1, 1); + root_poa->destroy (true, true); } if (destroy_orb) diff --git a/TAO/tests/ORB_shutdown/server.cpp b/TAO/tests/ORB_shutdown/server.cpp index ffeeb4fed2b..b1292735fc7 100644 --- a/TAO/tests/ORB_shutdown/server.cpp +++ b/TAO/tests/ORB_shutdown/server.cpp @@ -60,7 +60,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) Finished shutting down the ORB\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); diff --git a/TAO/tests/Object_Loader/driver.cpp b/TAO/tests/Object_Loader/driver.cpp index 7dd7e3cec93..811be70a625 100644 --- a/TAO/tests/Object_Loader/driver.cpp +++ b/TAO/tests/Object_Loader/driver.cpp @@ -68,7 +68,7 @@ ACE_TMAIN(int, ACE_TCHAR *[]) PortableServer::POA_var poa = PortableServer::POA::_narrow (obj.in ()); - poa->destroy (1, 1); + poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Objref_Sequence_Test/server.cpp b/TAO/tests/Objref_Sequence_Test/server.cpp index debc674c648..0104a9bf3b8 100644 --- a/TAO/tests/Objref_Sequence_Test/server.cpp +++ b/TAO/tests/Objref_Sequence_Test/server.cpp @@ -200,7 +200,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/OctetSeq/server.cpp b/TAO/tests/OctetSeq/server.cpp index cc6c92208a1..17f68715cd8 100644 --- a/TAO/tests/OctetSeq/server.cpp +++ b/TAO/tests/OctetSeq/server.cpp @@ -92,7 +92,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); ACE_OS::sleep(1); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); } ACE_OS::sleep(1); orb->destroy (); diff --git a/TAO/tests/Ondemand_Write/server.cpp b/TAO/tests/Ondemand_Write/server.cpp index 93f0474ab01..f25f9398edb 100644 --- a/TAO/tests/Ondemand_Write/server.cpp +++ b/TAO/tests/Ondemand_Write/server.cpp @@ -88,7 +88,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Oneway_Buffering/admin.cpp b/TAO/tests/Oneway_Buffering/admin.cpp index b771e06306d..0858858bee9 100644 --- a/TAO/tests/Oneway_Buffering/admin.cpp +++ b/TAO/tests/Oneway_Buffering/admin.cpp @@ -88,7 +88,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) admin - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Oneway_Buffering/server.cpp b/TAO/tests/Oneway_Buffering/server.cpp index af9a0bbe2b1..3540e408d41 100644 --- a/TAO/tests/Oneway_Buffering/server.cpp +++ b/TAO/tests/Oneway_Buffering/server.cpp @@ -109,7 +109,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Oneways_Invoking_Twoways/server.cpp b/TAO/tests/Oneways_Invoking_Twoways/server.cpp index 6a20088761f..615866c2959 100644 --- a/TAO/tests/Oneways_Invoking_Twoways/server.cpp +++ b/TAO/tests/Oneways_Invoking_Twoways/server.cpp @@ -95,7 +95,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "Now terminating test\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/POA/Bug_1592_Regression/server.cpp b/TAO/tests/POA/Bug_1592_Regression/server.cpp index a1aef31be38..c875f45768d 100644 --- a/TAO/tests/POA/Bug_1592_Regression/server.cpp +++ b/TAO/tests/POA/Bug_1592_Regression/server.cpp @@ -113,7 +113,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // Run the ORB event loop. orb->run (); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); diff --git a/TAO/tests/POA/EndpointPolicy/server.cpp b/TAO/tests/POA/EndpointPolicy/server.cpp index 37425ab21fd..e73f8c5fd88 100644 --- a/TAO/tests/POA/EndpointPolicy/server.cpp +++ b/TAO/tests/POA/EndpointPolicy/server.cpp @@ -347,7 +347,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) } try { - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/POA/Identity/Identity.cpp b/TAO/tests/POA/Identity/Identity.cpp index 4a099a65fd1..349810d7917 100644 --- a/TAO/tests/POA/Identity/Identity.cpp +++ b/TAO/tests/POA/Identity/Identity.cpp @@ -546,8 +546,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) forth_poa.in (), perform_deactivation_test); - root_poa->destroy (1, - 1); + root_poa->destroy (1, 1); orb->destroy (); } diff --git a/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp b/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp index 2af32ba3983..52ca11fa5b9 100644 --- a/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp +++ b/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp @@ -300,8 +300,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) first_task.wait (); second_task.wait (); - root_poa->destroy (1, - 1); + root_poa->destroy (1, 1); orb->destroy (); diff --git a/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp b/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp index 7aefcc52e47..5dc52e199fa 100644 --- a/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp +++ b/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp @@ -247,8 +247,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) // Wait for the Object_Activator thread to exit. thread_manager.wait (); - root_poa->destroy (1, - 1); + root_poa->destroy (1, 1); orb->destroy (); } diff --git a/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.cpp b/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.cpp index f2da5f47bfe..f3958139f0c 100644 --- a/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.cpp +++ b/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.cpp @@ -93,7 +93,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) root_poa->deactivate_object (id2.in ()); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp b/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp index de40e09f58e..979a9efe3aa 100644 --- a/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp +++ b/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp @@ -271,8 +271,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (result != 0) return result; - root_poa->destroy (1, - 1); + root_poa->destroy (1, 1); orb->destroy (); } diff --git a/TAO/tests/POA/POAManagerFactory/POAManagerFactory.cpp b/TAO/tests/POA/POAManagerFactory/POAManagerFactory.cpp index b5fb97379ad..98fb48a9442 100644 --- a/TAO/tests/POA/POAManagerFactory/POAManagerFactory.cpp +++ b/TAO/tests/POA/POAManagerFactory/POAManagerFactory.cpp @@ -255,7 +255,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) poa_manager_1->activate (); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); diff --git a/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp b/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp index 85578e2ed8a..d86e66c9e3f 100644 --- a/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp +++ b/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp @@ -178,7 +178,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // In non-debug compiles, asserts will disappear. ACE_UNUSED_ARG (result); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/POA/TIE/server.cpp b/TAO/tests/POA/TIE/server.cpp index 2021a022247..a8611154317 100644 --- a/TAO/tests/POA/TIE/server.cpp +++ b/TAO/tests/POA/TIE/server.cpp @@ -263,7 +263,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/POA/wait_for_completion/wait_for_completion.cpp b/TAO/tests/POA/wait_for_completion/wait_for_completion.cpp index 77a79ff11d9..c93b7869de2 100644 --- a/TAO/tests/POA/wait_for_completion/wait_for_completion.cpp +++ b/TAO/tests/POA/wait_for_completion/wait_for_completion.cpp @@ -124,7 +124,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) test_object->destroy_poa (); - first_poa->destroy (1, 1); + first_poa->destroy (true, true); orb1->destroy (); orb2->destroy (); diff --git a/TAO/tests/Parallel_Connect_Strategy/server.cpp b/TAO/tests/Parallel_Connect_Strategy/server.cpp index 9183225ec89..17a2178538d 100644 --- a/TAO/tests/Parallel_Connect_Strategy/server.cpp +++ b/TAO/tests/Parallel_Connect_Strategy/server.cpp @@ -105,7 +105,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Param_Test/server.cpp b/TAO/tests/Param_Test/server.cpp index b43f8aafaa1..64c2d74ee73 100644 --- a/TAO/tests/Param_Test/server.cpp +++ b/TAO/tests/Param_Test/server.cpp @@ -143,7 +143,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) orb_ptr->run (); - good_poa->destroy (1, 1); + good_poa->destroy (true, true); oa_ptr->destroy (1, 1); } diff --git a/TAO/tests/Portable_Interceptors/AMI/server.cpp b/TAO/tests/Portable_Interceptors/AMI/server.cpp index 167f3b67ab6..1bb451bf287 100644 --- a/TAO/tests/Portable_Interceptors/AMI/server.cpp +++ b/TAO/tests/Portable_Interceptors/AMI/server.cpp @@ -96,7 +96,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Portable_Interceptors/AdvSlot/server.cpp b/TAO/tests/Portable_Interceptors/AdvSlot/server.cpp index 540d1e6e0c8..a1049b1dced 100644 --- a/TAO/tests/Portable_Interceptors/AdvSlot/server.cpp +++ b/TAO/tests/Portable_Interceptors/AdvSlot/server.cpp @@ -220,7 +220,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // orb->run (); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); ACE_DEBUG ((LM_DEBUG, "Event loop finished.\n")); diff --git a/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/server.cpp b/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/server.cpp index 610a517976e..796b68816db 100644 --- a/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/server.cpp +++ b/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/server.cpp @@ -346,7 +346,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // orb->run (); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); ACE_DEBUG ((LM_DEBUG, "Event loop finished.\n")); diff --git a/TAO/tests/Portable_Interceptors/AdvSlotExt/server.cpp b/TAO/tests/Portable_Interceptors/AdvSlotExt/server.cpp index 16a2f0c3df1..8661f2c128b 100644 --- a/TAO/tests/Portable_Interceptors/AdvSlotExt/server.cpp +++ b/TAO/tests/Portable_Interceptors/AdvSlotExt/server.cpp @@ -265,7 +265,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // orb->run (); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); ACE_DEBUG ((LM_DEBUG, "Event loop finished.\n")); diff --git a/TAO/tests/Portable_Interceptors/Benchmark/server.cpp b/TAO/tests/Portable_Interceptors/Benchmark/server.cpp index 6cd7e017c72..6ee587c261d 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/server.cpp +++ b/TAO/tests/Portable_Interceptors/Benchmark/server.cpp @@ -109,7 +109,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); } catch (const CORBA::Exception& ex) { diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/server.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/server.cpp index 8b40121a747..dbf17b116da 100644 --- a/TAO/tests/Portable_Interceptors/Bug_1559/server.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_1559/server.cpp @@ -124,7 +124,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Portable_Interceptors/Bug_2133/server.cpp b/TAO/tests/Portable_Interceptors/Bug_2133/server.cpp index 90979bacc9f..4dfc1df9d87 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2133/server.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_2133/server.cpp @@ -77,7 +77,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - root_poa->destroy (1, 1 ); + root_poa->destroy (1, 1); orb->destroy (); diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server.cpp index d2bf86eb2b5..4cb9bcc77d1 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server.cpp @@ -103,7 +103,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Portable_Interceptors/Bug_3079/server.cpp b/TAO/tests/Portable_Interceptors/Bug_3079/server.cpp index c996ac5effe..89724f343bc 100644 --- a/TAO/tests/Portable_Interceptors/Bug_3079/server.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_3079/server.cpp @@ -114,7 +114,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // Run the ORB event loop. orb->run (); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); diff --git a/TAO/tests/Portable_Interceptors/Bug_3080/server.cpp b/TAO/tests/Portable_Interceptors/Bug_3080/server.cpp index 5ecdaf7cb13..19dcece99c8 100644 --- a/TAO/tests/Portable_Interceptors/Bug_3080/server.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_3080/server.cpp @@ -78,7 +78,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - root_poa->destroy (1, 1 ); + root_poa->destroy (1, 1); orb->destroy (); diff --git a/TAO/tests/Portable_Interceptors/Bug_3582/server.cpp b/TAO/tests/Portable_Interceptors/Bug_3582/server.cpp index 5d22f6f4295..11f45a914e7 100644 --- a/TAO/tests/Portable_Interceptors/Bug_3582/server.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_3582/server.cpp @@ -88,7 +88,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // Run the ORB event loop. orb->run (); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.cpp index 78d71c38a09..d59fc6c198a 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.cpp +++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.cpp @@ -74,7 +74,7 @@ Server_Task::svc (void) ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); } catch (const CORBA::Exception& ex) { diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.cpp b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.cpp index 6175ecbfc26..9217cbc8aae 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.cpp +++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.cpp @@ -73,7 +73,7 @@ Server_Task::svc (void) ACE_OS::nanosleep (&ts); ACE_DEBUG ((LM_DEBUG, "(%P|%t) server task - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); this->sorb_->destroy (); } diff --git a/TAO/tests/Portable_Interceptors/Dynamic/server.cpp b/TAO/tests/Portable_Interceptors/Dynamic/server.cpp index 809cd868d40..3f3e2a7d968 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/server.cpp +++ b/TAO/tests/Portable_Interceptors/Dynamic/server.cpp @@ -105,7 +105,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/server.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/server.cpp index 961421fbe02..10edc0ff78b 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/server.cpp +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/server.cpp @@ -180,7 +180,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // Run the ORB event loop. orb->run (); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/server.cpp b/TAO/tests/Portable_Interceptors/ORB_Shutdown/server.cpp index 3b7edf15ccd..3c2a694bc47 100644 --- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/server.cpp +++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/server.cpp @@ -103,7 +103,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // Run the ORB event loop. orb->run (); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/server.cpp b/TAO/tests/Portable_Interceptors/PolicyFactory/server.cpp index 8e74e7d00a3..3b7252f938e 100644 --- a/TAO/tests/Portable_Interceptors/PolicyFactory/server.cpp +++ b/TAO/tests/Portable_Interceptors/PolicyFactory/server.cpp @@ -77,7 +77,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) poa_manager->activate (); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.cpp index 78d71c38a09..d59fc6c198a 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.cpp +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.cpp @@ -74,7 +74,7 @@ Server_Task::svc (void) ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); } catch (const CORBA::Exception& ex) { diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.cpp index 47fc26ac6d6..a219c75da48 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.cpp +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.cpp @@ -75,7 +75,7 @@ Server_Task::svc (void) ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); this->sorb_->destroy (); } diff --git a/TAO/tests/Portable_Interceptors/Redirection/server.cpp b/TAO/tests/Portable_Interceptors/Redirection/server.cpp index e2886be4346..31c9c29f4df 100644 --- a/TAO/tests/Portable_Interceptors/Redirection/server.cpp +++ b/TAO/tests/Portable_Interceptors/Redirection/server.cpp @@ -107,7 +107,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // Run the ORB event loop. orb->run (); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp index b4fb5762a73..e9e6291cfe6 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp @@ -104,7 +104,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // Run the ORB event loop. orb->run (); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp index c028ce679b1..822ac3b1c7b 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp @@ -105,7 +105,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Reliable_Oneways/server.cpp b/TAO/tests/Reliable_Oneways/server.cpp index f2a93b65dd1..07581358b68 100644 --- a/TAO/tests/Reliable_Oneways/server.cpp +++ b/TAO/tests/Reliable_Oneways/server.cpp @@ -88,7 +88,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Servant_To_Reference_Test/server.cpp b/TAO/tests/Servant_To_Reference_Test/server.cpp index 47308260ac2..4f820fd6b1f 100644 --- a/TAO/tests/Servant_To_Reference_Test/server.cpp +++ b/TAO/tests/Servant_To_Reference_Test/server.cpp @@ -168,7 +168,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - test finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Server_Connection_Purging/server.cpp b/TAO/tests/Server_Connection_Purging/server.cpp index 1a3d909fe58..d7c4dc6c141 100644 --- a/TAO/tests/Server_Connection_Purging/server.cpp +++ b/TAO/tests/Server_Connection_Purging/server.cpp @@ -90,7 +90,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Server_Leaks/server.cpp b/TAO/tests/Server_Leaks/server.cpp index 94aa99fb5ab..df3b4ae6ecf 100644 --- a/TAO/tests/Server_Leaks/server.cpp +++ b/TAO/tests/Server_Leaks/server.cpp @@ -87,7 +87,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Server_Port_Zero/server.cpp b/TAO/tests/Server_Port_Zero/server.cpp index 3b4714ef588..ca3b298ab68 100644 --- a/TAO/tests/Server_Port_Zero/server.cpp +++ b/TAO/tests/Server_Port_Zero/server.cpp @@ -90,7 +90,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Single_Read/server.cpp b/TAO/tests/Single_Read/server.cpp index 9c2ecff4477..ca31d953f93 100644 --- a/TAO/tests/Single_Read/server.cpp +++ b/TAO/tests/Single_Read/server.cpp @@ -86,8 +86,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - root_poa->destroy (1, - 1); + root_poa->destroy (1, 1); } catch (const CORBA::Exception& ex) { diff --git a/TAO/tests/Skeleton_Inheritance/server.cpp b/TAO/tests/Skeleton_Inheritance/server.cpp index 93982a91f8f..0a7cfef2744 100644 --- a/TAO/tests/Skeleton_Inheritance/server.cpp +++ b/TAO/tests/Skeleton_Inheritance/server.cpp @@ -87,7 +87,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Smart_Proxies/dtor/server.cpp b/TAO/tests/Smart_Proxies/dtor/server.cpp index 36636331b5a..0670c1d43c9 100644 --- a/TAO/tests/Smart_Proxies/dtor/server.cpp +++ b/TAO/tests/Smart_Proxies/dtor/server.cpp @@ -116,8 +116,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - root_poa->destroy (1, - 1); + root_poa->destroy (1, 1); orb->destroy (); } diff --git a/TAO/tests/Smart_Proxies/server.cpp b/TAO/tests/Smart_Proxies/server.cpp index cbbaf5ef65d..a001cfde7a6 100644 --- a/TAO/tests/Smart_Proxies/server.cpp +++ b/TAO/tests/Smart_Proxies/server.cpp @@ -141,8 +141,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - root_poa->destroy (1, - 1); + root_poa->destroy (1, 1); orb->destroy (); } diff --git a/TAO/tests/Stack_Recursion/server.cpp b/TAO/tests/Stack_Recursion/server.cpp index eb309a0ca67..0cd3c047958 100644 --- a/TAO/tests/Stack_Recursion/server.cpp +++ b/TAO/tests/Stack_Recursion/server.cpp @@ -95,8 +95,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "Now terminating test\n")); - root_poa->destroy (1, - 1); + root_poa->destroy (1, 1); orb->destroy (); } diff --git a/TAO/tests/Strategies/server.cpp b/TAO/tests/Strategies/server.cpp index bee0491382e..38e456e3ee6 100644 --- a/TAO/tests/Strategies/server.cpp +++ b/TAO/tests/Strategies/server.cpp @@ -88,7 +88,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Time_Policy/main.cpp b/TAO/tests/Time_Policy/main.cpp index 65e88b1e611..74d6e0b30e0 100644 --- a/TAO/tests/Time_Policy/main.cpp +++ b/TAO/tests/Time_Policy/main.cpp @@ -142,9 +142,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG((LM_INFO, "Unable to reset OS time. Insufficient privileges or not supported.\n")); - root_poa->destroy (1, // ethernalize objects - 0 // wait for completion - ); + root_poa->destroy (true, // ethernalize objects + false); // wait for completion orb->destroy (); @@ -156,9 +155,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_Time_Value timeout (4, 0); orb->run (timeout); - root_poa->destroy (1, // ethernalize objects - 0 // wait for completion - ); + root_poa->destroy (true, // ethernalize objects + false); // wait for completion orb->destroy (); diff --git a/TAO/tests/Time_Policy_Custom/main.cpp b/TAO/tests/Time_Policy_Custom/main.cpp index 5b5b8bc1f49..a1e6e1c0a4b 100644 --- a/TAO/tests/Time_Policy_Custom/main.cpp +++ b/TAO/tests/Time_Policy_Custom/main.cpp @@ -127,9 +127,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_Time_Value timeout (4, 0); orb->run (timeout); - root_poa->destroy (1, // ethernalize objects - 0 // wait for completion - ); + root_poa->destroy (true, // ethernalize objects + false); // wait for completion orb->destroy (); diff --git a/TAO/tests/Timed_Buffered_Oneways/server.cpp b/TAO/tests/Timed_Buffered_Oneways/server.cpp index ab89abebe3a..ec136105a86 100644 --- a/TAO/tests/Timed_Buffered_Oneways/server.cpp +++ b/TAO/tests/Timed_Buffered_Oneways/server.cpp @@ -81,8 +81,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - root_poa->destroy (1, - 1); + root_poa->destroy (true, true); } catch (const CORBA::Exception& ex) { diff --git a/TAO/tests/TransportCurrent/Framework/server.cpp b/TAO/tests/TransportCurrent/Framework/server.cpp index b14bd1caec4..7d3caf9d35d 100644 --- a/TAO/tests/TransportCurrent/Framework/server.cpp +++ b/TAO/tests/TransportCurrent/Framework/server.cpp @@ -198,7 +198,7 @@ server_main (int argc, ACE_ERROR ((LM_ERROR, ACE_TEXT ("Server (%P|%t) ERROR: Interceptor self_test failed\n"))); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); server->shutdown (); diff --git a/TAO/tests/Two_Objects/server.cpp b/TAO/tests/Two_Objects/server.cpp index 165b1cb0d2a..b4f0aad2f6f 100644 --- a/TAO/tests/Two_Objects/server.cpp +++ b/TAO/tests/Two_Objects/server.cpp @@ -128,7 +128,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Typedef_String_Array/server.cpp b/TAO/tests/Typedef_String_Array/server.cpp index 15de0999914..7f7bd025258 100644 --- a/TAO/tests/Typedef_String_Array/server.cpp +++ b/TAO/tests/Typedef_String_Array/server.cpp @@ -87,7 +87,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/ZIOP/server.cpp b/TAO/tests/ZIOP/server.cpp index 0984286a805..be1dbfc6fd5 100644 --- a/TAO/tests/ZIOP/server.cpp +++ b/TAO/tests/ZIOP/server.cpp @@ -239,7 +239,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } |