diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-03-17 10:41:37 +0100 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-03-17 10:41:37 +0100 |
| commit | 78045a2ee2bee3a4521af3606d671f644e409fc2 (patch) | |
| tree | 2ccc4ee7c17b862b9f17c7a93c234e66ca1aadf9 | |
| parent | fe0a8e3c6c8bf1d10a71d1eee6a956c3560bd562 (diff) | |
| download | ATCD-78045a2ee2bee3a4521af3606d671f644e409fc2.tar.gz | |
bool changes
425 files changed, 456 insertions, 457 deletions
diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/Broker_i.cpp b/TAO/docs/tutorials/Quoter/RTCORBA/Broker_i.cpp index 8f582cda866..dd802e0045b 100644 --- a/TAO/docs/tutorials/Quoter/RTCORBA/Broker_i.cpp +++ b/TAO/docs/tutorials/Quoter/RTCORBA/Broker_i.cpp @@ -160,7 +160,7 @@ Stock_StockBrokerHome_i::handle_signal (int, ACE_DEBUG ((LM_DEBUG, "Shutting down the ORB\n")); - this->orb_->shutdown (0); + this->orb_->shutdown (false); return 0; } diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/docs/broker.html b/TAO/docs/tutorials/Quoter/RTCORBA/docs/broker.html index e9d7f5fa2ae..b48c5cd4f2a 100644 --- a/TAO/docs/tutorials/Quoter/RTCORBA/docs/broker.html +++ b/TAO/docs/tutorials/Quoter/RTCORBA/docs/broker.html @@ -17,7 +17,7 @@ <h3>Implementation of StockBrokerHome interface</h3> -This interface is used to register the necessary factories and mappings with the specified orb and +This interface is used to register the necessary factories and mappings with the specified orb and create StockBroker objects. <P> The Stock_StockBrokerHome_i class is generated automatically by the IDL compiler (using the -GI flag), @@ -47,14 +47,14 @@ The main steps of this function are described as follows: <P> <PRE> if (orb_->orb_core ()->reactor ()->register_handler (SIGINT, this) == -1) - ACE_DEBUG ((LM_DEBUG, "ERROR: Failed to register as a signal handler: %p\n", + ACE_DEBUG ((LM_DEBUG, "ERROR: Failed to register as a signal handler: %p\n", "register_handler\n")); </PRE> <h4>Implementing the create () member function</h4> -<li>If there is no instance of the StockBroker object in the StockBrokerHome object then create one. -The "orb_", "dist", and "stock_name" are in the arguments of the create () function. +<li>If there is no instance of the StockBroker object in the StockBrokerHome object then create one. +The "orb_", "dist", and "stock_name" are in the arguments of the create () function. Since the broker has nothing to do with any of the RTCORBA mechanisms, we can activate it under the default_POA, which is the RootPOA. </li> @@ -76,8 +76,8 @@ default_POA, which is the RootPOA. </li> <PRE> this->broker_->shutdown (); - - this->orb_->shutdown (0); + + this->orb_->shutdown (false); </PRE> <hr><h3>Implementation of StockBroker interface</h3> @@ -98,9 +98,9 @@ which is a subclass of POA_Stock::StockBroker class. <P> distributor_ (Stock::StockDistributor::_duplicate (dist)) </PRE> -The "quoter_", "consumer_", and "distributor_" are four private members of the Stock_StockBroker_i class. -They stand for the StockQuoter object that is used to get detailed stock information, the StockNameConsumer -object that is used to get notification of updates, and the StockDistributor object that the StockBroker object +The "quoter_", "consumer_", and "distributor_" are four private members of the Stock_StockBroker_i class. +They stand for the StockQuoter object that is used to get detailed stock information, the StockNameConsumer +object that is used to get notification of updates, and the StockDistributor object that the StockBroker object is used to unsubscribe to. <P> The main steps of this function are described as follows: <P> @@ -113,30 +113,30 @@ The main steps of this function are described as follows: <P> <li>Create a child POA using the former CORBA::PolicyList and narrow it to RTPOA.</li> -<li>Create a new instance of the StockNameConsumer object with the specified name and activate it +<li>Create a new instance of the StockNameConsumer object with the specified name and activate it under the former RTPOA.</li> <PRE> CORBA::Object_var obj = orb->resolve_initial_references ("RTORB"); RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (obj.in ()); - + TAO::Utils::PolicyList_Destroyer consumer_policies (1); consumer_policies.length (1); - + consumer_policies[0] = rt_orb->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED, Stock::Priority_Mapping::MEDIUM); - + PortableServer::POA_var poa = this->_default_POA (); PortableServer::POAManager_var poa_mgr = poa->the_POAManager (); - + PortableServer::POA_var child_poa = poa->create_POA ("StockNameConsumer_POA", poa_mgr.in (), consumer_policies); - + RTPortableServer::POA_var rt_poa = RTPortableServer::POA::_narrow (child_poa.in ()); - + this->consumer_ = new Stock_StockNameConsumer_i (*this, stock_name); PortableServer::ServantBase_var nameconsumer_owner_transfer = this->consumer_; rt_poa->activate_object (this->consumer_); @@ -187,11 +187,11 @@ under the former RTPOA.</li> <li>Deactivate the StockBroker object.</li> -<PRE> +<PRE> ::Stock::StockBroker_var broker = this->_this (); PortableServer::ObjectId_var oid = this->_default_POA ()->reference_to_id (broker.in ()); - - this->_default_POA ()->deactivate_object (oid.in ()); + + this->_default_POA ()->deactivate_object (oid.in ()); </PRE> <hr><b>Email: </b><a href="mailto:"</a<ADDRESS>shanshan.jiang@vanderbilt.edu</ADDRESS> diff --git a/TAO/examples/AMI/FL_Callback/Peer_i.cpp b/TAO/examples/AMI/FL_Callback/Peer_i.cpp index e6138231d81..738ca29e114 100644 --- a/TAO/examples/AMI/FL_Callback/Peer_i.cpp +++ b/TAO/examples/AMI/FL_Callback/Peer_i.cpp @@ -93,7 +93,7 @@ Peer_i::start (const PeerSet &the_peers, void Peer_i::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } // **************************************************************** diff --git a/TAO/examples/Borland/ORBThread.cpp b/TAO/examples/Borland/ORBThread.cpp index 4a0ae7da59e..0abef8cdf12 100644 --- a/TAO/examples/Borland/ORBThread.cpp +++ b/TAO/examples/Borland/ORBThread.cpp @@ -28,7 +28,7 @@ __fastcall TORBThread::~TORBThread () { try { - orb_->shutdown (0); + orb_->shutdown (false); } catch (const CORBA::Exception&) { diff --git a/TAO/examples/Borland/ReceiverImpl.cpp b/TAO/examples/Borland/ReceiverImpl.cpp index 0814ed2eda3..08c4d382eba 100644 --- a/TAO/examples/Borland/ReceiverImpl.cpp +++ b/TAO/examples/Borland/ReceiverImpl.cpp @@ -24,7 +24,7 @@ void TReceiverImplementation::message (const char* msg) void TReceiverImplementation::shutdown () { // Instruct the ORB to shutdown. - orb_->shutdown (0); + orb_->shutdown (false); } //--------------------------------------------------------------------------- void TReceiverImplementation::orb (CORBA::ORB_ptr o) diff --git a/TAO/examples/Buffered_AMI/client.cpp b/TAO/examples/Buffered_AMI/client.cpp index a0bcf15bbe1..b002be26a23 100644 --- a/TAO/examples/Buffered_AMI/client.cpp +++ b/TAO/examples/Buffered_AMI/client.cpp @@ -310,7 +310,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) test_object->shutdown (); } - root_poa->destroy (1, 1); + root_poa->destroy (true, true); // 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 1f4f6cc1812..6caa12973d9 100644 --- a/TAO/examples/Buffered_AMI/server.cpp +++ b/TAO/examples/Buffered_AMI/server.cpp @@ -75,7 +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 (true, true); } catch (const CORBA::Exception& ex) { diff --git a/TAO/examples/Buffered_AMI/test_i.cpp b/TAO/examples/Buffered_AMI/test_i.cpp index a01d94181e4..3ec9498c709 100644 --- a/TAO/examples/Buffered_AMI/test_i.cpp +++ b/TAO/examples/Buffered_AMI/test_i.cpp @@ -19,5 +19,5 @@ test_i::method (CORBA::ULong request_number, void test_i::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/examples/Buffered_Oneways/server.cpp b/TAO/examples/Buffered_Oneways/server.cpp index eb7d89b8bf6..0956a0c58c1 100644 --- a/TAO/examples/Buffered_Oneways/server.cpp +++ b/TAO/examples/Buffered_Oneways/server.cpp @@ -77,7 +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 (true, true); } catch (const CORBA::Exception& ex) { diff --git a/TAO/examples/Buffered_Oneways/test_i.cpp b/TAO/examples/Buffered_Oneways/test_i.cpp index 9910ee0e5f0..a35f50caa4d 100644 --- a/TAO/examples/Buffered_Oneways/test_i.cpp +++ b/TAO/examples/Buffered_Oneways/test_i.cpp @@ -18,5 +18,5 @@ test_i::method (CORBA::ULong request_number) void test_i::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/examples/Content_Server/AMI_Iterator/client.cpp b/TAO/examples/Content_Server/AMI_Iterator/client.cpp index b28938ec142..8ab5c5057c7 100644 --- a/TAO/examples/Content_Server/AMI_Iterator/client.cpp +++ b/TAO/examples/Content_Server/AMI_Iterator/client.cpp @@ -82,7 +82,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_OS::sleep (tv); } - orb->shutdown (0); + orb->shutdown (false); orb->destroy (); } diff --git a/TAO/examples/Content_Server/AMI_Observer/client.cpp b/TAO/examples/Content_Server/AMI_Observer/client.cpp index 0d9e236c511..8282ab8be15 100644 --- a/TAO/examples/Content_Server/AMI_Observer/client.cpp +++ b/TAO/examples/Content_Server/AMI_Observer/client.cpp @@ -87,7 +87,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_OS::sleep (tv); } - orb->shutdown (0); + orb->shutdown (false); //orb->destroy (); } diff --git a/TAO/examples/Content_Server/SMI_Iterator/client.cpp b/TAO/examples/Content_Server/SMI_Iterator/client.cpp index 41e1d89b3ce..374a61d600a 100644 --- a/TAO/examples/Content_Server/SMI_Iterator/client.cpp +++ b/TAO/examples/Content_Server/SMI_Iterator/client.cpp @@ -97,7 +97,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // Done with the Content_Iterator, so destroy it. contents->destroy (); - orb->shutdown (0); + orb->shutdown (false); // orb->destroy (); } diff --git a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/test_i.cpp b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/test_i.cpp index 82730645a95..b018b6d3ff6 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/test_i.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/test_i.cpp @@ -118,5 +118,5 @@ void Simple_Server_i::shutdown (void) { ACE_DEBUG ((LM_DEBUG, "shutdown request from client\n")); - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/test_i.cpp b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/test_i.cpp index ebe9a514d1b..a40ae883ebf 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/test_i.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/test_i.cpp @@ -118,5 +118,5 @@ void Simple_Server_i::shutdown (void) { ACE_DEBUG ((LM_DEBUG, "shutdown request from client\n")); - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/test_i.cpp b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/test_i.cpp index ebe9a514d1b..a40ae883ebf 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/test_i.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/test_i.cpp @@ -118,5 +118,5 @@ void Simple_Server_i::shutdown (void) { ACE_DEBUG ((LM_DEBUG, "shutdown request from client\n")); - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.cpp b/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.cpp index f453fbbb379..b0f4c261305 100644 --- a/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.cpp +++ b/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.cpp @@ -152,7 +152,7 @@ UDP_PerformanceClient::svc () // Shut down local ORB, trigger the end of the ORB event loop // in the main thread. - orb_->shutdown (0); + orb_->shutdown (false); } catch (const CORBA::Exception& ex) { diff --git a/TAO/examples/PluggableUDP/tests/Performance/UDP_i.cpp b/TAO/examples/PluggableUDP/tests/Performance/UDP_i.cpp index 9b5d7de3b6c..18a7e506b5d 100644 --- a/TAO/examples/PluggableUDP/tests/Performance/UDP_i.cpp +++ b/TAO/examples/PluggableUDP/tests/Performance/UDP_i.cpp @@ -114,7 +114,7 @@ UDP_i::shutdown (void) try { // Instruct the ORB to shutdown. - this->orb_->shutdown (0); + this->orb_->shutdown (false); } catch (const CORBA::Exception& ex) { diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.cpp b/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.cpp index 2986f5ce526..a9c9d47744e 100644 --- a/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.cpp +++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.cpp @@ -36,7 +36,7 @@ Simple_Server_i::shutdown (void) "Simple_Server_i::shutdown\n")); try { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } catch (const CORBA::Exception& ex) { diff --git a/TAO/examples/RTCORBA/Activity/Activity.cpp b/TAO/examples/RTCORBA/Activity/Activity.cpp index 89ff0aa17e5..70f2dbdd2f5 100644 --- a/TAO/examples/RTCORBA/Activity/Activity.cpp +++ b/TAO/examples/RTCORBA/Activity/Activity.cpp @@ -290,7 +290,7 @@ Activity::check_ifexit (void) } // shutdown the ORB - orb_->shutdown (0); + orb_->shutdown (false); } } diff --git a/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp b/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp index e4b152568c0..8b3f456d39c 100644 --- a/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp +++ b/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp @@ -331,7 +331,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) delete demo_consumer; - root_poa->destroy (1, 1); + root_poa->destroy (true, true); } catch (const CORBA::Exception& ex) diff --git a/TAO/examples/mfc/server.cpp b/TAO/examples/mfc/server.cpp index 235478c21ba..20b6e8fe2f5 100644 --- a/TAO/examples/mfc/server.cpp +++ b/TAO/examples/mfc/server.cpp @@ -108,7 +108,7 @@ CServerApp::~CServerApp() argv, orb_name); - the_shutdown_orb->shutdown (0); + the_shutdown_orb->shutdown (false); ACE_Thread_Manager::instance ()->wait (); } diff --git a/TAO/interop-tests/CdrOutArg/orbix/test_i.cxx b/TAO/interop-tests/CdrOutArg/orbix/test_i.cxx index 7524bc76713..25322aee405 100644 --- a/TAO/interop-tests/CdrOutArg/orbix/test_i.cxx +++ b/TAO/interop-tests/CdrOutArg/orbix/test_i.cxx @@ -14,5 +14,5 @@ CDR_Out_Arg_i::get_out (CORBA::Long_out arg) IT_THROW_DECL((CORBA::SystemExcepti void CDR_Out_Arg_i::shutdown (void) IT_THROW_DECL((CORBA::SystemException)) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/interop-tests/CdrOutArg/tao/test_i.cpp b/TAO/interop-tests/CdrOutArg/tao/test_i.cpp index 3b6ca427da1..28251a8109b 100644 --- a/TAO/interop-tests/CdrOutArg/tao/test_i.cpp +++ b/TAO/interop-tests/CdrOutArg/tao/test_i.cpp @@ -14,5 +14,5 @@ CDR_Out_Arg_i::get_out (CORBA::Long_out arg) void CDR_Out_Arg_i::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/Messenger_i.cpp index 98d86ae8cd2..037e494f62d 100644 --- a/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/Messenger_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/Messenger_i.cpp @@ -137,7 +137,7 @@ void Messenger_i::shutdown ( std::cout << std::endl; #endif - orb_->shutdown (0); + orb_->shutdown (false); } else { diff --git a/TAO/orbsvcs/FT_Naming_Service/FT_Naming_Service.cpp b/TAO/orbsvcs/FT_Naming_Service/FT_Naming_Service.cpp index 9ebeba5d3dc..11362ff2019 100644 --- a/TAO/orbsvcs/FT_Naming_Service/FT_Naming_Service.cpp +++ b/TAO/orbsvcs/FT_Naming_Service/FT_Naming_Service.cpp @@ -174,7 +174,7 @@ TAO_FT_Naming_Service::shutdown (void) { if (!CORBA::is_nil (orb_.in ())) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } } diff --git a/TAO/orbsvcs/LoadBalancer/Signal_Handler.cpp b/TAO/orbsvcs/LoadBalancer/Signal_Handler.cpp index bd4eca32960..be03640c14d 100644 --- a/TAO/orbsvcs/LoadBalancer/Signal_Handler.cpp +++ b/TAO/orbsvcs/LoadBalancer/Signal_Handler.cpp @@ -121,7 +121,7 @@ TAO_LB_Signal_Handler::perform_cleanup (int signum) this->poa_->destroy (1, 1); // Now shutdown the ORB. - this->orb_->shutdown (1); + this->orb_->shutdown (true); } catch (const CORBA::Exception& ex) { diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.cpp b/TAO/orbsvcs/Naming_Service/Naming_Service.cpp index 8bf80ec3966..ece6aeb0e1c 100644 --- a/TAO/orbsvcs/Naming_Service/Naming_Service.cpp +++ b/TAO/orbsvcs/Naming_Service/Naming_Service.cpp @@ -173,7 +173,7 @@ TAO_Naming_Service::shutdown (void) { if (!CORBA::is_nil (orb_.in ())) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } } diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp index adedd3b2be3..42242a6b8db 100644 --- a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp +++ b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp @@ -127,6 +127,6 @@ Consumer::disconnect_push_consumer (void) // In this example we shutdown the ORB when we disconnect from the // EC (or rather the EC disconnects from us), but this doesn't have // to be the case.... - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.cpp b/TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.cpp index deb993c4de8..d9c931e8164 100644 --- a/TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.cpp +++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.cpp @@ -60,5 +60,5 @@ Country_i::disconnect_push_consumer (void) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Country_i::disconnect_push_consumer, ") ACE_TEXT ("calling ORB shutdown...\n"))); - orb_->shutdown (0); + orb_->shutdown (false); } diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp index 853644a3477..ce7953aab05 100644 --- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp +++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp @@ -114,7 +114,7 @@ ReplicaController (CORBA::ORB_ptr orb) if (r < 0) { - orb_->shutdown (0); + orb_->shutdown (false); } } @@ -189,7 +189,7 @@ listener () ACE_DEBUG ((LM_DEBUG, "Group::InsufficienSpace\n")); } - orb_->shutdown (0); + orb_->shutdown (false); } PortableServer::POA_ptr ReplicaController:: diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly_i.cpp b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly_i.cpp index 713b8846c9a..919bec1dc19 100644 --- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly_i.cpp +++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly_i.cpp @@ -63,5 +63,5 @@ RolyPoly_i::shutdown (void) { ACE_DEBUG ((LM_DEBUG, "Server is shutting down.\n")); - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/orbsvcs/examples/LoadBalancing/StockFactory.cpp b/TAO/orbsvcs/examples/LoadBalancing/StockFactory.cpp index adfb7e71d9a..d5b9fcb84b9 100644 --- a/TAO/orbsvcs/examples/LoadBalancing/StockFactory.cpp +++ b/TAO/orbsvcs/examples/LoadBalancing/StockFactory.cpp @@ -25,5 +25,5 @@ StockFactory::get_stock (const char *symbol) void StockFactory::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp index 13b7f0b318e..bc3aa1ea8ea 100644 --- a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp +++ b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp @@ -105,6 +105,6 @@ Consumer::disconnect_push_consumer (void) // In this example we shutdown the ORB when we disconnect from the // EC (or rather the EC disconnects from us), but this doesn't have // to be the case.... - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp index 8dbbc806d8e..19e3a04b718 100644 --- a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp +++ b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp @@ -142,6 +142,6 @@ Consumer::disconnect_push_consumer (void) // In this example we shutdown the ORB when we disconnect from the // EC (or rather the EC disconnects from us), but this doesn't have // to be the case.... - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Consumer.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Consumer.cpp index 1b5f39bdc88..275d6fa001b 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/Consumer.cpp +++ b/TAO/orbsvcs/examples/Notify/Lanes/Consumer.cpp @@ -109,7 +109,7 @@ TAO_Notify_Lanes_Consumer::push_structured_event (const CosNotification::Structu this->deactivate (); // We received the event, shutdown the ORB. - this->orb_objects_.orb_->shutdown (1); + this->orb_objects_.orb_->shutdown (true); } catch (const CORBA::Exception& ex) { diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Supplier.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Supplier.cpp index 9d5fef0101d..3651c9fd1ef 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/Supplier.cpp +++ b/TAO/orbsvcs/examples/Notify/Lanes/Supplier.cpp @@ -89,7 +89,7 @@ TAO_Notify_Lanes_Supplier::run (void) this->deactivate (); // we're done. shutdown the ORB to exit the process. - this->orb_objects_.orb_->shutdown (1); + this->orb_objects_.orb_->shutdown (true); } void diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.cpp index 9d8b067c262..93d29935e5e 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.cpp +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.cpp @@ -150,7 +150,7 @@ TAO_Notify_ThreadPool_Consumer::push_structured_event (const CosNotification::St this->deactivate (); // We received the event, shutdown the ORB. - this->orb_objects_.orb_->shutdown (1); + this->orb_objects_.orb_->shutdown (true); } // Eat CPU: diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.cpp index d58430352d4..af8bf93d61b 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.cpp +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.cpp @@ -65,7 +65,7 @@ TAO_Notify_ThreadPool_Supplier::run (void) this->deactivate (); // we're done. shutdown the ORB to exit the process. - this->orb_objects_.orb_->shutdown (1); + this->orb_objects_.orb_->shutdown (true); } void diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp index a91010fce32..305d0d1fdf6 100644 --- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp +++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp @@ -147,7 +147,7 @@ Consumer::disconnect_push_consumer (void) // In this example we shutdown the ORB when we disconnect from the // EC (or rather the EC disconnects from us), but this doesn't have // to be the case.... - this->orb_->shutdown (0); + this->orb_->shutdown (false); } int diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp index 59afb5c30f0..02db0dc75ae 100644 --- a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp +++ b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp @@ -131,6 +131,6 @@ Consumer::disconnect_push_consumer (void) // In this example we shutdown the ORB when we disconnect from the // EC (or rather the EC disconnects from us), but this doesn't have // to be the case.... - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/orbsvcs/examples/Security/Send_File/test_i.cpp b/TAO/orbsvcs/examples/Security/Send_File/test_i.cpp index e86fd97902c..8f06732eb5c 100644 --- a/TAO/orbsvcs/examples/Security/Send_File/test_i.cpp +++ b/TAO/orbsvcs/examples/Security/Send_File/test_i.cpp @@ -15,5 +15,5 @@ Simple_Server_i::send_line (const char *line) void Simple_Server_i::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp index 2ed8f27eb16..b7b171e9427 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp @@ -90,7 +90,7 @@ namespace virtual int handle_timeout (const ACE_Time_Value&, const void*) { - orb_->shutdown (1); + orb_->shutdown (true); return 0; } diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp index 54778f26be8..074abf69614 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp @@ -1044,7 +1044,7 @@ TAO_Repository_i::num_pkinds () const void TAO_Repository_i::shutdown () { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.cpp index 784043e9fc9..b0045236621 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.cpp +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.cpp @@ -33,5 +33,5 @@ Roundtrip::test_method (Test::Timestamp send_time, void Roundtrip::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.cpp index 15e2c5152ca..09d65fc4c2d 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.cpp +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.cpp @@ -27,5 +27,5 @@ Roundtrip::test_method (Test::Timestamp send_time, void Roundtrip::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.cpp index 3eb381fbc20..326d70b369a 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.cpp @@ -28,5 +28,5 @@ Roundtrip::test_method (Test::Timestamp send_time, void Roundtrip::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.cpp index d33346276e0..b25dd442757 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.cpp @@ -21,7 +21,7 @@ Session_Factory::create_new_session (Test::Callback_ptr cb) void Session_Factory::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } PortableServer::POA_ptr diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Shutdown.inl b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Shutdown.inl index e166926ac3b..2c39df6c11f 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Shutdown.inl +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Shutdown.inl @@ -11,7 +11,7 @@ ORB_Shutdown::operator () (CORBA::ORB_ptr orb) { try { - orb->shutdown (0); + orb->shutdown (false); } catch (const CORBA::Exception&){ }; } diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp index 3670eafb803..2017a94ba4b 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp @@ -51,7 +51,7 @@ Peer_Base::shutdown (void) RtecEventChannelAdmin::EventChannel::_nil (); } - this->orb_->shutdown (0); + this->orb_->shutdown (false); } CORBA::Object_ptr diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp index d96e98353b5..1e6ab467be5 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp @@ -445,7 +445,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) DISTRIBUTER::instance ()->shut_down (); -// orb->shutdown(1); +// orb->shutdown(true); } catch (const CORBA::Exception& ex) diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp index 7df40cfa1af..793325b735d 100644 --- a/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp @@ -144,7 +144,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) orb->run (tv); ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - orb->shutdown (1); + orb->shutdown (true); // flow_spec.length (0); // stream_control->stop (flow_spec); diff --git a/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.cpp b/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.cpp index 638a1f4fdaf..64e3ab0b89a 100644 --- a/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.cpp +++ b/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.cpp @@ -64,5 +64,5 @@ Test_i::try_and_create_POA (void) void Test_i::shutdown (void) { - orb_->shutdown (0); + orb_->shutdown (false); } diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.cpp b/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.cpp index e6639b2ffdc..2979804966c 100644 --- a/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.cpp +++ b/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.cpp @@ -37,7 +37,7 @@ Simple_Server_i::shutdown (const char* key) int still_alive = 1; if (!ACE_OS::strcmp (_key.in(), key)) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); still_alive = 0; } diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.cpp index cf2f94c7019..306ab9f96e6 100644 --- a/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.cpp +++ b/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.cpp @@ -37,7 +37,7 @@ Simple_Server_i::shutdown (const char* key) int still_alive = 1; if (!ACE_OS::strcmp (_key.in(), key)) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); still_alive = 0; } diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.cpp index 949168c1d71..e0dafe75c04 100644 --- a/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.cpp +++ b/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.cpp @@ -19,7 +19,7 @@ Hello::get_string (void) void Hello::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } void diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.cpp index df4990b3c12..b5d6d3241fd 100644 --- a/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.cpp +++ b/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.cpp @@ -10,7 +10,7 @@ Hello::Hello (CORBA::ORB_ptr orb, Test::Hello_ptr, CORBA::ULong) void Hello::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } void diff --git a/TAO/orbsvcs/tests/Bug_2316_Regression/Test_impl.cpp b/TAO/orbsvcs/tests/Bug_2316_Regression/Test_impl.cpp index a495edb4b0e..eeac4b4a56b 100644 --- a/TAO/orbsvcs/tests/Bug_2316_Regression/Test_impl.cpp +++ b/TAO/orbsvcs/tests/Bug_2316_Regression/Test_impl.cpp @@ -2,7 +2,7 @@ void Server_impl::shutdown () { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } Server_impl::Server_impl (CORBA::ORB_ptr orb) diff --git a/TAO/orbsvcs/tests/Bug_2377_Regression/Hello_Impl.cpp b/TAO/orbsvcs/tests/Bug_2377_Regression/Hello_Impl.cpp index 2e0f3e265ce..b88f0e1d8af 100644 --- a/TAO/orbsvcs/tests/Bug_2377_Regression/Hello_Impl.cpp +++ b/TAO/orbsvcs/tests/Bug_2377_Regression/Hello_Impl.cpp @@ -18,7 +18,7 @@ Hello_Impl::shutdown () { try { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } catch (const CORBA::Exception& ex) { diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.cpp index 33537d3fd5c..daf613de7ad 100644 --- a/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.cpp +++ b/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.cpp @@ -12,7 +12,7 @@ Hello::Hello (CORBA::ORB_ptr orb, Test::Hello_ptr, CORBA::ULong) void Hello::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } void diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_2800_Regression/Hello.cpp index ec539001733..5b23d33f306 100644 --- a/TAO/orbsvcs/tests/Bug_2800_Regression/Hello.cpp +++ b/TAO/orbsvcs/tests/Bug_2800_Regression/Hello.cpp @@ -16,5 +16,5 @@ Hello::get_string (void) void Hello::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/NsShutdown.cpp b/TAO/orbsvcs/tests/Bug_2800_Regression/NsShutdown.cpp index ba73cb16178..c11d9ebe239 100644 --- a/TAO/orbsvcs/tests/Bug_2800_Regression/NsShutdown.cpp +++ b/TAO/orbsvcs/tests/Bug_2800_Regression/NsShutdown.cpp @@ -8,5 +8,5 @@ NsShutdown::NsShutdown (CORBA::ORB_ptr orb) void NsShutdown::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/orbsvcs/tests/Bug_2925_Regression/Hello_Impl.cpp b/TAO/orbsvcs/tests/Bug_2925_Regression/Hello_Impl.cpp index bd9e2c54acc..83bf01d55fa 100644 --- a/TAO/orbsvcs/tests/Bug_2925_Regression/Hello_Impl.cpp +++ b/TAO/orbsvcs/tests/Bug_2925_Regression/Hello_Impl.cpp @@ -22,7 +22,7 @@ Hello_Impl::shutdown () { try { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } catch (const CORBA::Exception& ex) { diff --git a/TAO/orbsvcs/tests/Bug_3215_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_3215_Regression/server.cpp index 70f288cd8fc..b602f5839d3 100644 --- a/TAO/orbsvcs/tests/Bug_3215_Regression/server.cpp +++ b/TAO/orbsvcs/tests/Bug_3215_Regression/server.cpp @@ -219,7 +219,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_3216_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_3216_Regression/server.cpp index 2cc6c56815f..281c701abdd 100644 --- a/TAO/orbsvcs/tests/Bug_3216_Regression/server.cpp +++ b/TAO/orbsvcs/tests/Bug_3216_Regression/server.cpp @@ -216,7 +216,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_3444_Regression/Test_impl.cpp b/TAO/orbsvcs/tests/Bug_3444_Regression/Test_impl.cpp index d4ee0cdc8a1..d1a4c81904f 100644 --- a/TAO/orbsvcs/tests/Bug_3444_Regression/Test_impl.cpp +++ b/TAO/orbsvcs/tests/Bug_3444_Regression/Test_impl.cpp @@ -9,5 +9,5 @@ Server_impl::Server_impl (CORBA::ORB_ptr orb) void Server_impl::shutdown () { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/orbsvcs/tests/Bug_3486_Regression/DllORB.cpp b/TAO/orbsvcs/tests/Bug_3486_Regression/DllORB.cpp index 6be97192212..f0bedb02d62 100644 --- a/TAO/orbsvcs/tests/Bug_3486_Regression/DllORB.cpp +++ b/TAO/orbsvcs/tests/Bug_3486_Regression/DllORB.cpp @@ -142,7 +142,7 @@ DllORB::fini () // attempt to protect against sporadic BAD_INV_ORDER exceptions ACE_OS::sleep (ACE_Time_Value (0, 500)); - mv_orb_->shutdown (1); + mv_orb_->shutdown (true); } catch (...) { diff --git a/TAO/orbsvcs/tests/Bug_3598b_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_3598b_Regression/server.cpp index 4dfc1df9d87..951ccc19cb7 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 (true, true); orb->destroy (); diff --git a/TAO/orbsvcs/tests/Bug_3673_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_3673_Regression/Hello.cpp index ec539001733..5b23d33f306 100644 --- a/TAO/orbsvcs/tests/Bug_3673_Regression/Hello.cpp +++ b/TAO/orbsvcs/tests/Bug_3673_Regression/Hello.cpp @@ -16,5 +16,5 @@ Hello::get_string (void) void Hello::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/orbsvcs/tests/Bug_3673_Regression/NsShutdown.cpp b/TAO/orbsvcs/tests/Bug_3673_Regression/NsShutdown.cpp index ba73cb16178..c11d9ebe239 100644 --- a/TAO/orbsvcs/tests/Bug_3673_Regression/NsShutdown.cpp +++ b/TAO/orbsvcs/tests/Bug_3673_Regression/NsShutdown.cpp @@ -8,5 +8,5 @@ NsShutdown::NsShutdown (CORBA::ORB_ptr orb) void NsShutdown::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/orbsvcs/tests/Bug_4080_Regression/test_impl.cpp b/TAO/orbsvcs/tests/Bug_4080_Regression/test_impl.cpp index c5cab70f9d5..ec19adb739f 100644 --- a/TAO/orbsvcs/tests/Bug_4080_Regression/test_impl.cpp +++ b/TAO/orbsvcs/tests/Bug_4080_Regression/test_impl.cpp @@ -28,7 +28,7 @@ UIPMC_Object_Impl::process () ACE_DEBUG ((LM_DEBUG, "Server %t Shutting down\n")); try { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } catch (const CORBA::Exception& ex) { diff --git a/TAO/orbsvcs/tests/COIOP_Naming_Test/Hello.cpp b/TAO/orbsvcs/tests/COIOP_Naming_Test/Hello.cpp index 4c63fd5a6f1..d12a6c3eba5 100644 --- a/TAO/orbsvcs/tests/COIOP_Naming_Test/Hello.cpp +++ b/TAO/orbsvcs/tests/COIOP_Naming_Test/Hello.cpp @@ -61,5 +61,5 @@ Hello::shutdown (void) // call to this method before shutting down the ORB. We sleep // to avoid BAD_INV_ORDER exceptions on fast dual processor machines. ACE_OS::sleep (1); - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp index c3da2d41833..12f9bffe059 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp @@ -304,7 +304,7 @@ ECT_Throughput::shutdown_consumer (void*) { ACE_DEBUG ((LM_DEBUG, "(%t) shutting down the ORB\n")); - // Not needed: this->orb_->shutdown (0); + // Not needed: this->orb_->shutdown (false); } } diff --git a/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp b/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp index ee9c617cff6..73657253981 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp @@ -103,7 +103,7 @@ EC_Consumer::disconnect (void) this->ec_->destroy (); - this->orb_->shutdown (0); + this->orb_->shutdown (false); } //////////////////////////////////////////////////////////// diff --git a/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp b/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp index d1ac1fd8127..aecce1812e7 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp @@ -72,7 +72,7 @@ EC_Consumer::disconnect (void) this->ec_->destroy (); - this->orb_->shutdown (0); + this->orb_->shutdown (false); } //////////////////////////////////////////////////////////// diff --git a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp index 4aed9d8120c..68b0f6af7f7 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp @@ -515,7 +515,7 @@ Heartbeat_Application::shutdown (void) // Shutdown the ORB. try { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } catch (const CORBA::Exception& ex) { diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp index 6beb80cdb60..ef170af39cf 100644 --- a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp +++ b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp @@ -326,7 +326,7 @@ const ACE_TCHAR * StubFaultNotifier::identity () const */ void StubFaultNotifier::shutdown_i (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } void StubFaultNotifier::push_structured_fault ( diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/Basic.cpp b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/Basic.cpp index 7aec5868fc3..50ae2d24637 100644 --- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/Basic.cpp +++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/Basic.cpp @@ -59,5 +59,5 @@ Basic::remove_member (void) void Basic::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/orbsvcs/tests/FT_Naming/Federation/Hello.cpp b/TAO/orbsvcs/tests/FT_Naming/Federation/Hello.cpp index ec539001733..5b23d33f306 100644 --- a/TAO/orbsvcs/tests/FT_Naming/Federation/Hello.cpp +++ b/TAO/orbsvcs/tests/FT_Naming/Federation/Hello.cpp @@ -16,5 +16,5 @@ Hello::get_string (void) void Hello::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/Basic.cpp b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/Basic.cpp index be646b71269..4fad32a961d 100644 --- a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/Basic.cpp +++ b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/Basic.cpp @@ -56,5 +56,5 @@ Basic::remove_member (void) void Basic::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/orbsvcs/tests/FT_Naming/stress_storable/Basic.cpp b/TAO/orbsvcs/tests/FT_Naming/stress_storable/Basic.cpp index be646b71269..4fad32a961d 100644 --- a/TAO/orbsvcs/tests/FT_Naming/stress_storable/Basic.cpp +++ b/TAO/orbsvcs/tests/FT_Naming/stress_storable/Basic.cpp @@ -56,5 +56,5 @@ Basic::remove_member (void) void Basic::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.cpp index 07ad3876c6b..74f41eb6ccf 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.cpp @@ -24,5 +24,5 @@ test_i::shutdown (void) ACE_DEBUG ((LM_DEBUG, "Server is shutting down via object %d.\n", this->number_)); - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp index 6fff9977833..d401dee65a5 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp @@ -27,5 +27,5 @@ Simple_Server_i::remote_call (void) void Simple_Server_i::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/ami_test_i.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/ami_test_i.cpp index 2c51abe5a8f..7e306372e07 100644 --- a/TAO/orbsvcs/tests/HTIOP/AMI/ami_test_i.cpp +++ b/TAO/orbsvcs/tests/HTIOP/AMI/ami_test_i.cpp @@ -51,7 +51,7 @@ AMI_Test_i::foo (CORBA::Long_out out_l, void AMI_Test_i::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp b/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp index 9263fbe4b54..d763b3045f3 100644 --- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp +++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp @@ -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 (true, true); delete servant; return 0; diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp b/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp index 9a23fdb768c..32b64d17de5 100644 --- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp +++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp @@ -15,7 +15,7 @@ void Callback_i::shutdown (void) { ACE_DEBUG ((LM_DEBUG, "Performing clean shutdown\n")); - this->orb_->shutdown (0); + this->orb_->shutdown (false); } void @@ -81,5 +81,5 @@ Simple_Server_i::call_client (void) void Simple_Server_i::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/Hello.cpp b/TAO/orbsvcs/tests/HTIOP/Hello/Hello.cpp index 5af5a0e8c4f..060bd693cc1 100644 --- a/TAO/orbsvcs/tests/HTIOP/Hello/Hello.cpp +++ b/TAO/orbsvcs/tests/HTIOP/Hello/Hello.cpp @@ -17,6 +17,6 @@ Hello::get_string (void) void Hello::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); ACE_DEBUG ((LM_DEBUG,"in shutdown\n")); } diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Messenger_i.cpp b/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Messenger_i.cpp index 0cee65e9fe1..2c34caaf305 100644 --- a/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Messenger_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/Messenger_i.cpp @@ -12,7 +12,7 @@ Messenger_i::send_message (const char *user_name, const char *subject, message = CORBA::string_dup (reply); if (++this->count_ == 6) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } return true; } diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression_i.cpp b/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression_i.cpp index b3894cc55a0..7ac20a171bc 100644 --- a/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression_i.cpp @@ -12,7 +12,7 @@ bug_689_regression_i::~bug_689_regression_i (void) void bug_689_regression_i::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } void bug_689_regression_i::noop (void) diff --git a/TAO/orbsvcs/tests/ImplRepo/RestartServer/Messenger_i.cpp b/TAO/orbsvcs/tests/ImplRepo/RestartServer/Messenger_i.cpp index 0b930b42c3b..cbbdf490f3e 100644 --- a/TAO/orbsvcs/tests/ImplRepo/RestartServer/Messenger_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/RestartServer/Messenger_i.cpp @@ -49,5 +49,5 @@ Messenger_i::abort (CORBA::Short delay_secs) void Messenger_i::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp index 8e0bb0fc9f7..7c1e0cec61c 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp @@ -127,7 +127,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/InterfaceRepo/IFR_Self_Recursive_IDL_Test/GoodDay.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/GoodDay.cpp index d8c4133b4b0..fa074920bd1 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/GoodDay.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/GoodDay.cpp @@ -18,7 +18,7 @@ GoodDay::get_string (void) void GoodDay::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.cpp index acb1480fcd9..ec6d7aa3de6 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.cpp @@ -53,5 +53,5 @@ Basic::remove_member (void) void Basic::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Basic.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Basic.cpp index 0f7ec95b13c..d83119bbc0f 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Basic.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Basic.cpp @@ -80,7 +80,7 @@ Basic::remove_member (void) void Basic::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } void diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.cpp index f8d659d18bb..8ec4ef7c08c 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.cpp @@ -61,5 +61,5 @@ Basic::remove_member (void) void Basic::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.cpp index 5180232ea6e..3f97b2c8979 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.cpp @@ -61,5 +61,5 @@ Simple::remove_member (void) void Simple::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/orbsvcs/tests/Miop/McastFragmentation/Hello_Impl.cpp b/TAO/orbsvcs/tests/Miop/McastFragmentation/Hello_Impl.cpp index b984ea371d5..85d1014ec3e 100644 --- a/TAO/orbsvcs/tests/Miop/McastFragmentation/Hello_Impl.cpp +++ b/TAO/orbsvcs/tests/Miop/McastFragmentation/Hello_Impl.cpp @@ -110,7 +110,7 @@ Hello_Impl::shutdown (void) { try { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } catch (const CORBA::Exception& ex) { diff --git a/TAO/orbsvcs/tests/Miop/McastHello/McastHello.cpp b/TAO/orbsvcs/tests/Miop/McastHello/McastHello.cpp index fa003a0b18e..8d15f0c9314 100644 --- a/TAO/orbsvcs/tests/Miop/McastHello/McastHello.cpp +++ b/TAO/orbsvcs/tests/Miop/McastHello/McastHello.cpp @@ -50,7 +50,7 @@ McastHello::send_large_octet_array (const Test::Octets &payload) void McastHello::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } CORBA::Boolean diff --git a/TAO/orbsvcs/tests/Miop/McastLocal/McastHello.cpp b/TAO/orbsvcs/tests/Miop/McastLocal/McastHello.cpp index 400c79e3753..5c49bf752c7 100644 --- a/TAO/orbsvcs/tests/Miop/McastLocal/McastHello.cpp +++ b/TAO/orbsvcs/tests/Miop/McastLocal/McastHello.cpp @@ -52,7 +52,7 @@ McastHello::send_large_octet_array (const Test::Octets &payload) void McastHello::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } CORBA::Boolean diff --git a/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/Test_impl.cpp b/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/Test_impl.cpp index d4ee0cdc8a1..d1a4c81904f 100644 --- a/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/Test_impl.cpp +++ b/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/Test_impl.cpp @@ -9,5 +9,5 @@ Server_impl::Server_impl (CORBA::ORB_ptr orb) void Server_impl::shutdown () { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/orbsvcs/tests/Miop/McastZIOP/McastHello.cpp b/TAO/orbsvcs/tests/Miop/McastZIOP/McastHello.cpp index 7dd3173ccc4..a32eb6127e1 100644 --- a/TAO/orbsvcs/tests/Miop/McastZIOP/McastHello.cpp +++ b/TAO/orbsvcs/tests/Miop/McastZIOP/McastHello.cpp @@ -52,7 +52,7 @@ McastHello::send_large_octet_array (const Test::Octets &payload) void McastHello::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } CORBA::Boolean diff --git a/TAO/orbsvcs/tests/Notify/Bug_2926_Regression/DllORB.cpp b/TAO/orbsvcs/tests/Notify/Bug_2926_Regression/DllORB.cpp index 17b9cd35d21..6eeb671b997 100644 --- a/TAO/orbsvcs/tests/Notify/Bug_2926_Regression/DllORB.cpp +++ b/TAO/orbsvcs/tests/Notify/Bug_2926_Regression/DllORB.cpp @@ -139,7 +139,7 @@ DllORB::fini () // attempt to protect against sporadic BAD_INV_ORDER exceptions ACE_OS::sleep (ACE_Time_Value (0, 500)); - mv_orb_->shutdown (1); + mv_orb_->shutdown (true); } catch (...) { diff --git a/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/DllOrb.cpp b/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/DllOrb.cpp index 524a606b81e..6acc045b104 100644 --- a/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/DllOrb.cpp +++ b/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/DllOrb.cpp @@ -102,7 +102,7 @@ DllOrb::fini (void) mv_rootPOA_->destroy (1, 1); mv_rootPOA_ = PortableServer::POA::_nil (); - mv_orb_->shutdown (1); + mv_orb_->shutdown (true); ACE_DEBUG ((LM_ERROR, ACE_TEXT ("wait() ...\n"))); // wait for our threads to finish diff --git a/TAO/orbsvcs/tests/Notify/Bug_3646b_Regression/DllORB.cpp b/TAO/orbsvcs/tests/Notify/Bug_3646b_Regression/DllORB.cpp index 75e5e91adc6..c4b31f6be1d 100644 --- a/TAO/orbsvcs/tests/Notify/Bug_3646b_Regression/DllORB.cpp +++ b/TAO/orbsvcs/tests/Notify/Bug_3646b_Regression/DllORB.cpp @@ -139,7 +139,7 @@ DllORB::fini () // attempt to protect against sporadic BAD_INV_ORDER exceptions ACE_OS::sleep (ACE_Time_Value (0, 500)); - mv_orb_->shutdown (1); + mv_orb_->shutdown (true); } catch (...) { diff --git a/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/DllORB.cpp b/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/DllORB.cpp index c0eb3b9104c..4417f7fd73a 100644 --- a/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/DllORB.cpp +++ b/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/DllORB.cpp @@ -139,7 +139,7 @@ DllORB::fini () // attempt to protect against sporadic BAD_INV_ORDER exceptions ACE_OS::sleep (ACE_Time_Value (0, 500)); - mv_orb_->shutdown (1); + mv_orb_->shutdown (true); } catch (...) { diff --git a/TAO/orbsvcs/tests/Notify/Bug_3646d_Regression/DllORB.cpp b/TAO/orbsvcs/tests/Notify/Bug_3646d_Regression/DllORB.cpp index 67bd25ffacf..c6735f16c80 100644 --- a/TAO/orbsvcs/tests/Notify/Bug_3646d_Regression/DllORB.cpp +++ b/TAO/orbsvcs/tests/Notify/Bug_3646d_Regression/DllORB.cpp @@ -139,7 +139,7 @@ DllORB::fini () // attempt to protect against sporadic BAD_INV_ORDER exceptions ACE_OS::sleep (ACE_Time_Value (0, 500)); - mv_orb_->shutdown (1); + mv_orb_->shutdown (true); } catch (...) { diff --git a/TAO/orbsvcs/tests/Notify/Bug_3663_Regression/DllORB.cpp b/TAO/orbsvcs/tests/Notify/Bug_3663_Regression/DllORB.cpp index f9d682490a7..6928a180772 100644 --- a/TAO/orbsvcs/tests/Notify/Bug_3663_Regression/DllORB.cpp +++ b/TAO/orbsvcs/tests/Notify/Bug_3663_Regression/DllORB.cpp @@ -139,7 +139,7 @@ DllORB::fini () // attempt to protect against sporadic BAD_INV_ORDER exceptions ACE_OS::sleep (ACE_Time_Value (0, 500)); - mv_orb_->shutdown (1); + mv_orb_->shutdown (true); } catch (...) { diff --git a/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/DllORB.cpp b/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/DllORB.cpp index b7398ba4c0a..d10ad9b7f29 100644 --- a/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/DllORB.cpp +++ b/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/DllORB.cpp @@ -139,7 +139,7 @@ DllORB::fini () // attempt to protect against sporadic BAD_INV_ORDER exceptions ACE_OS::sleep (ACE_Time_Value (0, 500)); - mv_orb_->shutdown (1); + mv_orb_->shutdown (true); } catch (...) { diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp index 3d3ae83bf82..910eae6827d 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp @@ -130,7 +130,7 @@ RedGreen_Test::run (void) } this->destroy_ec (); - this->orb_->shutdown (0); + this->orb_->shutdown (false); } catch (const CORBA::Exception& ex) { diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp index 90b629a2271..5fbc76eb76d 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp @@ -199,7 +199,7 @@ Notify_Throughput::Notify_Throughput (void) Notify_Throughput::~Notify_Throughput () { - this->orb_->shutdown (0); + this->orb_->shutdown (false); delete[] payload_; } diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/test_i.cpp b/TAO/orbsvcs/tests/Security/BiDirectional/test_i.cpp index 6eda29aac32..0fd0602b0b4 100644 --- a/TAO/orbsvcs/tests/Security/BiDirectional/test_i.cpp +++ b/TAO/orbsvcs/tests/Security/BiDirectional/test_i.cpp @@ -15,7 +15,7 @@ void Callback_i::shutdown (void) { ACE_DEBUG ((LM_DEBUG, "Performing clean shutdown\n")); - this->orb_->shutdown (0); + this->orb_->shutdown (false); } void @@ -89,5 +89,5 @@ Simple_Server_i::call_client (void) void Simple_Server_i::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.cpp b/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.cpp index 31219471c54..3093f44df94 100644 --- a/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.cpp +++ b/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.cpp @@ -38,5 +38,5 @@ TX_Object_i::recv (DataSeq_out data) void TX_Object_i::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/orbsvcs/tests/Security/Bug_1107_Regression/Foo_i.cpp b/TAO/orbsvcs/tests/Security/Bug_1107_Regression/Foo_i.cpp index 62c288957bd..c2e101e5072 100644 --- a/TAO/orbsvcs/tests/Security/Bug_1107_Regression/Foo_i.cpp +++ b/TAO/orbsvcs/tests/Security/Bug_1107_Regression/Foo_i.cpp @@ -32,5 +32,5 @@ Foo_i::baz (void) void Foo_i::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Messenger_i.cpp b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Messenger_i.cpp index 6eda348f749..613fff71ac8 100644 --- a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Messenger_i.cpp +++ b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Messenger_i.cpp @@ -58,5 +58,5 @@ Messenger_i::call_message (const char * user_name) void Messenger_i::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/orbsvcs/tests/Security/Callback/server_i.cpp b/TAO/orbsvcs/tests/Security/Callback/server_i.cpp index 6bf8ec74eea..8084f520be6 100644 --- a/TAO/orbsvcs/tests/Security/Callback/server_i.cpp +++ b/TAO/orbsvcs/tests/Security/Callback/server_i.cpp @@ -25,5 +25,5 @@ server_i::test_request (const char *msg) void server_i::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/test_i.cpp b/TAO/orbsvcs/tests/Security/Crash_Test/test_i.cpp index c7ad6c5d87d..a44b4fe03df 100644 --- a/TAO/orbsvcs/tests/Security/Crash_Test/test_i.cpp +++ b/TAO/orbsvcs/tests/Security/Crash_Test/test_i.cpp @@ -27,5 +27,5 @@ Simple_Server_i::send_line (const char *) void Simple_Server_i::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/client.cpp b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/client.cpp index 14056b16ec7..58430f8754a 100644 --- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/client.cpp +++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/client.cpp @@ -137,7 +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 (true, true); } 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 68a39ceda53..d69309da73e 100644 --- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/server.cpp +++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/server.cpp @@ -163,7 +163,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& ex) { diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp index 73c17a55d6d..41dad39c610 100644 --- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp +++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp @@ -76,5 +76,5 @@ Simple_Server_i::test_method (CORBA::Long x) void Simple_Server_i::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp index 4ed9fe098cc..b7fb970ade2 100644 --- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp +++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp @@ -18,7 +18,7 @@ Simple_Server_i::test_method (CORBA::Long x) void Simple_Server_i::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } //--------------------------------------------------------------------------- diff --git a/TAO/orbsvcs/tests/Security/Null_Cipher/Foo_i.cpp b/TAO/orbsvcs/tests/Security/Null_Cipher/Foo_i.cpp index 7fc392022de..55c5b3d403c 100644 --- a/TAO/orbsvcs/tests/Security/Null_Cipher/Foo_i.cpp +++ b/TAO/orbsvcs/tests/Security/Null_Cipher/Foo_i.cpp @@ -11,5 +11,5 @@ void Foo_i::shutdown (void) { ACE_DEBUG ((LM_DEBUG,"SUCCESS: server received expected shutdown\n")); - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.cpp b/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.cpp index 5e4e5a88765..26c904715f2 100644 --- a/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.cpp +++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.cpp @@ -28,5 +28,5 @@ Foo_i::baz (void) void Foo_i::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/orbsvcs/tests/Security/mixed_security_test/Foo_i.cpp b/TAO/orbsvcs/tests/Security/mixed_security_test/Foo_i.cpp index 3e73bea0445..7adcf51ace6 100644 --- a/TAO/orbsvcs/tests/Security/mixed_security_test/Foo_i.cpp +++ b/TAO/orbsvcs/tests/Security/mixed_security_test/Foo_i.cpp @@ -51,5 +51,5 @@ Foo_i::baz (void) void Foo_i::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/performance-tests/Latency/AMH_Single_Threaded/Roundtrip.cpp b/TAO/performance-tests/Latency/AMH_Single_Threaded/Roundtrip.cpp index f81d6368ae5..30233b647a2 100644 --- a/TAO/performance-tests/Latency/AMH_Single_Threaded/Roundtrip.cpp +++ b/TAO/performance-tests/Latency/AMH_Single_Threaded/Roundtrip.cpp @@ -20,5 +20,5 @@ Roundtrip::shutdown ( Test::AMH_RoundtripResponseHandler_ptr _tao_rh) { _tao_rh->shutdown (); - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/performance-tests/Latency/AMI/Roundtrip.cpp b/TAO/performance-tests/Latency/AMI/Roundtrip.cpp index 8ff0316770f..dcd4de0db31 100644 --- a/TAO/performance-tests/Latency/AMI/Roundtrip.cpp +++ b/TAO/performance-tests/Latency/AMI/Roundtrip.cpp @@ -14,5 +14,5 @@ Roundtrip::test_method (Test::Timestamp send_time) void Roundtrip::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/performance-tests/Latency/Collocation/Roundtrip.cpp b/TAO/performance-tests/Latency/Collocation/Roundtrip.cpp index 47278cd07e3..6382128d071 100644 --- a/TAO/performance-tests/Latency/Collocation/Roundtrip.cpp +++ b/TAO/performance-tests/Latency/Collocation/Roundtrip.cpp @@ -15,5 +15,5 @@ Roundtrip::test_method (Test::Timestamp send_time) void Roundtrip::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/performance-tests/Latency/DII/Roundtrip.cpp b/TAO/performance-tests/Latency/DII/Roundtrip.cpp index 8ff0316770f..dcd4de0db31 100644 --- a/TAO/performance-tests/Latency/DII/Roundtrip.cpp +++ b/TAO/performance-tests/Latency/DII/Roundtrip.cpp @@ -14,5 +14,5 @@ Roundtrip::test_method (Test::Timestamp send_time) void Roundtrip::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/performance-tests/Latency/DSI/Roundtrip.cpp b/TAO/performance-tests/Latency/DSI/Roundtrip.cpp index b0564128b93..6fa219f821c 100644 --- a/TAO/performance-tests/Latency/DSI/Roundtrip.cpp +++ b/TAO/performance-tests/Latency/DSI/Roundtrip.cpp @@ -14,7 +14,7 @@ Roundtrip::invoke (CORBA::ServerRequest_ptr request) { if (ACE_OS::strcmp ("shutdown", request->operation ()) == 0) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); return; } diff --git a/TAO/performance-tests/Latency/Deferred/Roundtrip.cpp b/TAO/performance-tests/Latency/Deferred/Roundtrip.cpp index 8ff0316770f..dcd4de0db31 100644 --- a/TAO/performance-tests/Latency/Deferred/Roundtrip.cpp +++ b/TAO/performance-tests/Latency/Deferred/Roundtrip.cpp @@ -14,5 +14,5 @@ Roundtrip::test_method (Test::Timestamp send_time) void Roundtrip::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/performance-tests/Latency/Single_Threaded/Roundtrip.cpp b/TAO/performance-tests/Latency/Single_Threaded/Roundtrip.cpp index 8ff0316770f..dcd4de0db31 100644 --- a/TAO/performance-tests/Latency/Single_Threaded/Roundtrip.cpp +++ b/TAO/performance-tests/Latency/Single_Threaded/Roundtrip.cpp @@ -14,5 +14,5 @@ Roundtrip::test_method (Test::Timestamp send_time) void Roundtrip::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/performance-tests/Latency/Thread_Per_Connection/Roundtrip.cpp b/TAO/performance-tests/Latency/Thread_Per_Connection/Roundtrip.cpp index 8ff0316770f..dcd4de0db31 100644 --- a/TAO/performance-tests/Latency/Thread_Per_Connection/Roundtrip.cpp +++ b/TAO/performance-tests/Latency/Thread_Per_Connection/Roundtrip.cpp @@ -14,5 +14,5 @@ Roundtrip::test_method (Test::Timestamp send_time) void Roundtrip::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/performance-tests/Latency/Thread_Pool/Roundtrip.cpp b/TAO/performance-tests/Latency/Thread_Pool/Roundtrip.cpp index 8ff0316770f..dcd4de0db31 100644 --- a/TAO/performance-tests/Latency/Thread_Pool/Roundtrip.cpp +++ b/TAO/performance-tests/Latency/Thread_Pool/Roundtrip.cpp @@ -14,5 +14,5 @@ Roundtrip::test_method (Test::Timestamp send_time) void Roundtrip::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/performance-tests/Memory/IORsize/Memory_Growth.cpp b/TAO/performance-tests/Memory/IORsize/Memory_Growth.cpp index 9f69bbb5bea..cefeecab98f 100644 --- a/TAO/performance-tests/Memory/IORsize/Memory_Growth.cpp +++ b/TAO/performance-tests/Memory/IORsize/Memory_Growth.cpp @@ -25,5 +25,5 @@ Memory_Growth::send_objref (const Test::PayLoad & /*p*/ void Memory_Growth::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.cpp b/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.cpp index 7c1868c2027..a3658526edd 100644 --- a/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.cpp +++ b/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.cpp @@ -14,5 +14,5 @@ Memory_Growth::ping (void) void Memory_Growth::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/performance-tests/POA/Implicit_Activation/Factory.cpp b/TAO/performance-tests/POA/Implicit_Activation/Factory.cpp index 079be5674be..3158372ce64 100644 --- a/TAO/performance-tests/POA/Implicit_Activation/Factory.cpp +++ b/TAO/performance-tests/POA/Implicit_Activation/Factory.cpp @@ -22,5 +22,5 @@ Factory::create_simple_object (void) void Factory::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } 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 30b08bd8998..b59b62d15c8 100644 --- a/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp +++ b/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp @@ -393,7 +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 (true, true); // Cleanup delete[] object_ids; diff --git a/TAO/performance-tests/Protocols/distributor.cpp b/TAO/performance-tests/Protocols/distributor.cpp index 362bfdf6e90..a6b2caf5a2b 100644 --- a/TAO/performance-tests/Protocols/distributor.cpp +++ b/TAO/performance-tests/Protocols/distributor.cpp @@ -300,7 +300,7 @@ test_i::shutdown (void) { this->receiver_->shutdown (); - this->orb_->shutdown (0); + this->orb_->shutdown (false); } int diff --git a/TAO/performance-tests/Protocols/receiver.cpp b/TAO/performance-tests/Protocols/receiver.cpp index efbb376b2f1..524adf15166 100644 --- a/TAO/performance-tests/Protocols/receiver.cpp +++ b/TAO/performance-tests/Protocols/receiver.cpp @@ -319,7 +319,7 @@ test_i::shutdown (void) ACE_DEBUG ((LM_DEBUG, "test_i::shutdown\n")); - this->orb_->shutdown (0); + this->orb_->shutdown (false); } int diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.cpp index 7c0770ae78a..62f2a93ba14 100644 --- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.cpp +++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.cpp @@ -24,5 +24,5 @@ Test_i::shutdown (const char *orb_id) argv, orb_id); - orb->shutdown (0); + orb->shutdown (false); } diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/server.cpp b/TAO/performance-tests/RTCorba/Oneways/Reliable/server.cpp index deef0062d3f..bd393f055bf 100644 --- a/TAO/performance-tests/RTCorba/Oneways/Reliable/server.cpp +++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/server.cpp @@ -142,7 +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 (true, true); } catch (const CORBA::Exception& ex) { diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.cpp b/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.cpp index 04cf24da8fa..0ff821381dc 100644 --- a/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.cpp +++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.cpp @@ -37,5 +37,5 @@ Test_i::twoway_work_test (CORBA::ULong work) void Test_i::shutdown () { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/performance-tests/RTCorba/Thread_Pool/server.cpp b/TAO/performance-tests/RTCorba/Thread_Pool/server.cpp index 8cfdad88d30..31ef0cbc69b 100644 --- a/TAO/performance-tests/RTCorba/Thread_Pool/server.cpp +++ b/TAO/performance-tests/RTCorba/Thread_Pool/server.cpp @@ -61,7 +61,7 @@ test_i::_default_POA (void) void test_i::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } static const ACE_TCHAR *ior_output_file = ACE_TEXT("ior"); diff --git a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Roundtrip.cpp b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Roundtrip.cpp index ed762fb28c6..4fb94c707f4 100644 --- a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Roundtrip.cpp +++ b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Roundtrip.cpp @@ -77,5 +77,5 @@ Roundtrip::shutdown ( Test::AMH_RoundtripResponseHandler_ptr _tao_rh) { _tao_rh->shutdown (); - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip.cpp b/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip.cpp index 9866ceb0226..4eeef2f1ab6 100644 --- a/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip.cpp +++ b/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip.cpp @@ -51,5 +51,5 @@ Roundtrip::test_short_method (const Test::short_load &, void Roundtrip::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/performance-tests/Sequence_Latency/DII/Roundtrip.cpp b/TAO/performance-tests/Sequence_Latency/DII/Roundtrip.cpp index 9866ceb0226..4eeef2f1ab6 100644 --- a/TAO/performance-tests/Sequence_Latency/DII/Roundtrip.cpp +++ b/TAO/performance-tests/Sequence_Latency/DII/Roundtrip.cpp @@ -51,5 +51,5 @@ Roundtrip::test_short_method (const Test::short_load &, void Roundtrip::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/performance-tests/Sequence_Latency/DSI/Roundtrip.cpp b/TAO/performance-tests/Sequence_Latency/DSI/Roundtrip.cpp index a6c32d05e50..489cb27b340 100644 --- a/TAO/performance-tests/Sequence_Latency/DSI/Roundtrip.cpp +++ b/TAO/performance-tests/Sequence_Latency/DSI/Roundtrip.cpp @@ -16,7 +16,7 @@ Roundtrip::invoke (CORBA::ServerRequest_ptr request) { if (ACE_OS::strcmp ("shutdown", request->operation ()) == 0) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); return; } diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/Roundtrip.cpp b/TAO/performance-tests/Sequence_Latency/Deferred/Roundtrip.cpp index 9866ceb0226..4eeef2f1ab6 100644 --- a/TAO/performance-tests/Sequence_Latency/Deferred/Roundtrip.cpp +++ b/TAO/performance-tests/Sequence_Latency/Deferred/Roundtrip.cpp @@ -51,5 +51,5 @@ Roundtrip::test_short_method (const Test::short_load &, void Roundtrip::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/performance-tests/Sequence_Latency/Single_Threaded/Roundtrip.cpp b/TAO/performance-tests/Sequence_Latency/Single_Threaded/Roundtrip.cpp index 9866ceb0226..4eeef2f1ab6 100644 --- a/TAO/performance-tests/Sequence_Latency/Single_Threaded/Roundtrip.cpp +++ b/TAO/performance-tests/Sequence_Latency/Single_Threaded/Roundtrip.cpp @@ -51,5 +51,5 @@ Roundtrip::test_short_method (const Test::short_load &, void Roundtrip::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Roundtrip.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Roundtrip.cpp index 36cf829597b..e6dcf32173c 100644 --- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Roundtrip.cpp +++ b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Roundtrip.cpp @@ -50,5 +50,5 @@ Roundtrip::test_short_method (const Test::short_load &, void Roundtrip::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Roundtrip.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Roundtrip.cpp index 36cf829597b..e6dcf32173c 100644 --- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Roundtrip.cpp +++ b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Roundtrip.cpp @@ -50,5 +50,5 @@ Roundtrip::test_short_method (const Test::short_load &, void Roundtrip::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/performance-tests/Throughput/Receiver_Factory.cpp b/TAO/performance-tests/Throughput/Receiver_Factory.cpp index 989dd7d6779..dbff14c5c48 100644 --- a/TAO/performance-tests/Throughput/Receiver_Factory.cpp +++ b/TAO/performance-tests/Throughput/Receiver_Factory.cpp @@ -32,5 +32,5 @@ Receiver_Factory::create_receiver (void) void Receiver_Factory::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tao/ImR_Client/ServerObject_i.cpp b/TAO/tao/ImR_Client/ServerObject_i.cpp index 19a07caf630..ac871f10bdb 100644 --- a/TAO/tao/ImR_Client/ServerObject_i.cpp +++ b/TAO/tao/ImR_Client/ServerObject_i.cpp @@ -22,7 +22,7 @@ ServerObject_i::shutdown (void) // Note : We want our child POAs to be able to unregister themselves from // the ImR, so we must destroy them before shutting down the orb. poa_->destroy(1, 0); - this->orb_->shutdown (0); + this->orb_->shutdown (false); } PortableServer::POA_ptr diff --git a/TAO/tao/Utils/Server_Main.cpp b/TAO/tao/Utils/Server_Main.cpp index 634b61c4d5d..b21ec16ebb8 100644 --- a/TAO/tao/Utils/Server_Main.cpp +++ b/TAO/tao/Utils/Server_Main.cpp @@ -81,7 +81,7 @@ TAO::Utils::Server_Main<SERVANT>::run (int argc, ACE_TCHAR *argv[]) } servant.fini (); - orb->shutdown (1); + orb->shutdown (true); TAOLIB_ERROR ((LM_INFO, "%T %C (%P|%t) Terminated normally. %C\n", diff --git a/TAO/tests/AMH_Exceptions/server.cpp b/TAO/tests/AMH_Exceptions/server.cpp index 14dce3d4eb6..5f7d3cd9fef 100644 --- a/TAO/tests/AMH_Exceptions/server.cpp +++ b/TAO/tests/AMH_Exceptions/server.cpp @@ -56,7 +56,7 @@ ST_AMH_Servant::test_method (Test::AMH_RoundtripResponseHandler_ptr _tao_rh, void ST_AMH_Servant::shutdown (Test::AMH_RoundtripResponseHandler_ptr /*_tao_rh*/) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } /*** Server Declaration ***/ diff --git a/TAO/tests/AMI/ami_test_i.cpp b/TAO/tests/AMI/ami_test_i.cpp index ce59c0ad3d7..b87718680e2 100644 --- a/TAO/tests/AMI/ami_test_i.cpp +++ b/TAO/tests/AMI/ami_test_i.cpp @@ -63,7 +63,7 @@ AMI_Test_i::foo (CORBA::Long_out out_l, void AMI_Test_i::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } CORBA::Long diff --git a/TAO/tests/AMI_Buffering/AMI_Buffering.cpp b/TAO/tests/AMI_Buffering/AMI_Buffering.cpp index 0de4b07c10e..4c592413169 100644 --- a/TAO/tests/AMI_Buffering/AMI_Buffering.cpp +++ b/TAO/tests/AMI_Buffering/AMI_Buffering.cpp @@ -66,5 +66,5 @@ AMI_Buffering::try_shutdown(void) ACE_DEBUG ((LM_DEBUG, "(%P|%t) max nesting level: %d\n", max_nest_)); this->admin_->shutdown(); - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.cpp b/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.cpp index 8182e47a7b5..9706776f1fc 100644 --- a/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.cpp +++ b/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.cpp @@ -34,5 +34,5 @@ AMI_Buffering_Admin::flush (void) void AMI_Buffering_Admin::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/AMI_Timeouts/timeout_client.cpp b/TAO/tests/AMI_Timeouts/timeout_client.cpp index dbef6403ab7..1afcd61030d 100644 --- a/TAO/tests/AMI_Timeouts/timeout_client.cpp +++ b/TAO/tests/AMI_Timeouts/timeout_client.cpp @@ -60,7 +60,7 @@ TimeoutClient::svc () ACE_OS::sleep (tv); // shut down local ORB - orb_->shutdown (0); + orb_->shutdown (false); } catch (const CORBA::Exception& ex) { diff --git a/TAO/tests/Abstract_Interface/test_i.cpp b/TAO/tests/Abstract_Interface/test_i.cpp index d194ca19ed1..7ec9006996a 100644 --- a/TAO/tests/Abstract_Interface/test_i.cpp +++ b/TAO/tests/Abstract_Interface/test_i.cpp @@ -45,7 +45,7 @@ passer_i::passer_i (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa) void passer_i::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } void diff --git a/TAO/tests/Any/Recursive/Hello.cpp b/TAO/tests/Any/Recursive/Hello.cpp index b28f967a261..b1013a6061c 100644 --- a/TAO/tests/Any/Recursive/Hello.cpp +++ b/TAO/tests/Any/Recursive/Hello.cpp @@ -21,5 +21,5 @@ Hello::get_any (CORBA::Any const & the_any) void Hello::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/BiDirectional/test_i.cpp b/TAO/tests/BiDirectional/test_i.cpp index 0b3be60d958..b94de23c40e 100644 --- a/TAO/tests/BiDirectional/test_i.cpp +++ b/TAO/tests/BiDirectional/test_i.cpp @@ -13,7 +13,7 @@ void Callback_i::shutdown (void) { ACE_DEBUG ((LM_DEBUG, "Performing clean shutdown\n")); - this->orb_->shutdown (0); + this->orb_->shutdown (false); } void @@ -80,5 +80,5 @@ Simple_Server_i::call_client (void) void Simple_Server_i::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/BiDirectional_DelayedUpcall/test_i.cpp b/TAO/tests/BiDirectional_DelayedUpcall/test_i.cpp index 2d2ee11a346..1ce4b4964a8 100644 --- a/TAO/tests/BiDirectional_DelayedUpcall/test_i.cpp +++ b/TAO/tests/BiDirectional_DelayedUpcall/test_i.cpp @@ -16,7 +16,7 @@ Callback_i::shutdown (void) // Shutdown the server before we shutdown our own ORB this->server_->shutdown (); // now we shut down - this->orb_->shutdown (0); + this->orb_->shutdown (false); } void diff --git a/TAO/tests/BiDirectional_NestedUpcall/test_i.cpp b/TAO/tests/BiDirectional_NestedUpcall/test_i.cpp index 42390e1554a..fb14458b6e6 100644 --- a/TAO/tests/BiDirectional_NestedUpcall/test_i.cpp +++ b/TAO/tests/BiDirectional_NestedUpcall/test_i.cpp @@ -12,7 +12,7 @@ void Callback_i::shutdown (void) { ACE_DEBUG ((LM_DEBUG, "Performing clean shutdown\n")); - this->orb_->shutdown (0); + this->orb_->shutdown (false); } void @@ -65,5 +65,5 @@ Simple_Server_i::callback_object (Callback_ptr callback void Simple_Server_i::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Big_AMI/ami_test_i.cpp b/TAO/tests/Big_AMI/ami_test_i.cpp index 4965af06df9..08a56b206e7 100644 --- a/TAO/tests/Big_AMI/ami_test_i.cpp +++ b/TAO/tests/Big_AMI/ami_test_i.cpp @@ -39,5 +39,5 @@ AMI_Test_i::foo (CORBA::Long_out out_l, void AMI_Test_i::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Big_Oneways/Peer.cpp b/TAO/tests/Big_Oneways/Peer.cpp index 64b68b46bab..be8124c5d82 100644 --- a/TAO/tests/Big_Oneways/Peer.cpp +++ b/TAO/tests/Big_Oneways/Peer.cpp @@ -48,5 +48,5 @@ Peer::shutdown (void) ACE_DEBUG ((LM_DEBUG, "(%P|%t) Peer::shutdown, shutting down ORB\n")); - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Big_Twoways/Peer.cpp b/TAO/tests/Big_Twoways/Peer.cpp index 33fe93ec561..a7df3f550ec 100644 --- a/TAO/tests/Big_Twoways/Peer.cpp +++ b/TAO/tests/Big_Twoways/Peer.cpp @@ -38,5 +38,5 @@ Peer::shutdown (void) ACE_DEBUG ((LM_DEBUG, "(%P|%t) Peer::shutdown, shutting down ORB\n")); - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.cpp b/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.cpp index c6c31ef56c4..64b3444a447 100644 --- a/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.cpp +++ b/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.cpp @@ -17,5 +17,5 @@ Blocking_Sync_None::slow_operation (const Test::Payload &, void Blocking_Sync_None::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Bug_1020_Basic_Regression/client.cpp b/TAO/tests/Bug_1020_Basic_Regression/client.cpp index ebecc2cf9cb..1ff260e8f3c 100644 --- a/TAO/tests/Bug_1020_Basic_Regression/client.cpp +++ b/TAO/tests/Bug_1020_Basic_Regression/client.cpp @@ -140,7 +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 (true, true); orb->destroy (); } diff --git a/TAO/tests/Bug_1020_Basic_Regression/server.cpp b/TAO/tests/Bug_1020_Basic_Regression/server.cpp index 3dab1c4edcb..597d5e77153 100644 --- a/TAO/tests/Bug_1020_Basic_Regression/server.cpp +++ b/TAO/tests/Bug_1020_Basic_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_1254_Regression/BlobServer.cpp b/TAO/tests/Bug_1254_Regression/BlobServer.cpp index 6c1c7f310ba..ee750de19eb 100644 --- a/TAO/tests/Bug_1254_Regression/BlobServer.cpp +++ b/TAO/tests/Bug_1254_Regression/BlobServer.cpp @@ -28,5 +28,5 @@ BlobServerImpl::test( void BlobServerImpl::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Bug_1330_Regression/Test_i.cpp b/TAO/tests/Bug_1330_Regression/Test_i.cpp index 2493d0ae37d..f4c287557a5 100644 --- a/TAO/tests/Bug_1330_Regression/Test_i.cpp +++ b/TAO/tests/Bug_1330_Regression/Test_i.cpp @@ -17,5 +17,5 @@ Test_i::test_method (void) void Test_i::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.cpp b/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.cpp index ac1615c8e5d..873e414d900 100644 --- a/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.cpp +++ b/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.cpp @@ -173,7 +173,7 @@ Thread_Pool::svc (void) --nt_; if (nt_ == 0) { - orb_->shutdown (0); + orb_->shutdown (false); } // Note that the <ACE_Task::svc_run> method automatically removes us diff --git a/TAO/tests/Bug_1361_Regression/server.cpp b/TAO/tests/Bug_1361_Regression/server.cpp index af2560972ed..8540bbe2b58 100644 --- a/TAO/tests/Bug_1361_Regression/server.cpp +++ b/TAO/tests/Bug_1361_Regression/server.cpp @@ -84,7 +84,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) mymanager.wait (); worker.wait (); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/Bug_1383_Regression/Callee_i.cpp b/TAO/tests/Bug_1383_Regression/Callee_i.cpp index 395feea2a80..4d5ee73bb23 100644 --- a/TAO/tests/Bug_1383_Regression/Callee_i.cpp +++ b/TAO/tests/Bug_1383_Regression/Callee_i.cpp @@ -2,5 +2,5 @@ void Callee_i::callback (const char * message) { - ACE_DEBUG ((LM_DEBUG, "Callee_i::callback: message is %s", message)); + ACE_DEBUG ((LM_DEBUG, "Callee_i::callback: message is %C", message)); } diff --git a/TAO/tests/Bug_1383_Regression/SimpleClient.cpp b/TAO/tests/Bug_1383_Regression/SimpleClient.cpp index 98ae89f398b..02406f7c6af 100644 --- a/TAO/tests/Bug_1383_Regression/SimpleClient.cpp +++ b/TAO/tests/Bug_1383_Regression/SimpleClient.cpp @@ -122,7 +122,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "done sleeping\n")); - _orb->shutdown(1); + _orb->shutdown(true); } catch (const ::CORBA::Exception &ex) { diff --git a/TAO/tests/Bug_1383_Regression/simple_i.h b/TAO/tests/Bug_1383_Regression/simple_i.h index 642ef9fbdbe..bd36daca0a5 100644 --- a/TAO/tests/Bug_1383_Regression/simple_i.h +++ b/TAO/tests/Bug_1383_Regression/simple_i.h @@ -15,7 +15,6 @@ public: int handle_timeout(const ACE_Time_Value & currentTime, const void * data); private: - CORBA::ORB_ptr m_orb; Callee_var m_callee; }; diff --git a/TAO/tests/Bug_1482_Regression/Reply_Handler.cpp b/TAO/tests/Bug_1482_Regression/Reply_Handler.cpp index 77f8f79a96f..d72bfca1e54 100644 --- a/TAO/tests/Bug_1482_Regression/Reply_Handler.cpp +++ b/TAO/tests/Bug_1482_Regression/Reply_Handler.cpp @@ -29,7 +29,7 @@ Reply_Handler::next_prime_excep ( ACE_Time_Value tv (10, 0); this->orb_->run (tv); - this->orb_->shutdown (0); + this->orb_->shutdown (false); } catch (const CORBA::Exception& ex) { diff --git a/TAO/tests/Bug_1568_Regression/server.cpp b/TAO/tests/Bug_1568_Regression/server.cpp index 5749f95c663..3f0e61cff5d 100644 --- a/TAO/tests/Bug_1568_Regression/server.cpp +++ b/TAO/tests/Bug_1568_Regression/server.cpp @@ -66,7 +66,7 @@ Simple_C::op4(Baz::AMH_CResponseHandler_ptr _tao_rh) void Simple_C::shutdown (Baz::AMH_CResponseHandler_ptr) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } // **************************************************************** diff --git a/TAO/tests/Bug_1676_Regression/Hello.cpp b/TAO/tests/Bug_1676_Regression/Hello.cpp index cdc0726f92b..04cf5fc9b90 100644 --- a/TAO/tests/Bug_1676_Regression/Hello.cpp +++ b/TAO/tests/Bug_1676_Regression/Hello.cpp @@ -71,5 +71,5 @@ Hello::mod_stringList (::Test::StringList & iosl) void Hello::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Bug_2084_Regression/EventNode.cpp b/TAO/tests/Bug_2084_Regression/EventNode.cpp index 17818af0c26..cc6680548c3 100644 --- a/TAO/tests/Bug_2084_Regression/EventNode.cpp +++ b/TAO/tests/Bug_2084_Regression/EventNode.cpp @@ -54,5 +54,5 @@ void EventNode::registerHello ( ::Test::Hello_ptr h ) void EventNode::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Bug_2084_Regression/Hello.cpp b/TAO/tests/Bug_2084_Regression/Hello.cpp index cf2be3df7bc..654d838d4d4 100644 --- a/TAO/tests/Bug_2084_Regression/Hello.cpp +++ b/TAO/tests/Bug_2084_Regression/Hello.cpp @@ -58,5 +58,5 @@ Hello::shutdown (void) // call to this method before shutting down the ORB. We sleep // to avoid BAD_INV_ORDER exceptions on fast dual processor machines. ACE_OS::sleep (1); - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Bug_2174_Regression/test_i.cpp b/TAO/tests/Bug_2174_Regression/test_i.cpp index f2de8bdfec6..024e702ba64 100644 --- a/TAO/tests/Bug_2174_Regression/test_i.cpp +++ b/TAO/tests/Bug_2174_Regression/test_i.cpp @@ -25,5 +25,5 @@ Simple_Server_i::shutdown (void) { ACE_DEBUG ((LM_DEBUG, "server (%P) Received shutdown request from client\n")); - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Bug_2183_Regression/Hello.cpp b/TAO/tests/Bug_2183_Regression/Hello.cpp index 733fe2bfcaf..0d000b9f195 100644 --- a/TAO/tests/Bug_2183_Regression/Hello.cpp +++ b/TAO/tests/Bug_2183_Regression/Hello.cpp @@ -14,5 +14,5 @@ Hello::get_string (void) void Hello::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Bug_2186_Regression/Hello.cpp b/TAO/tests/Bug_2186_Regression/Hello.cpp index 0eed190c1f6..6cf8290cbb1 100644 --- a/TAO/tests/Bug_2186_Regression/Hello.cpp +++ b/TAO/tests/Bug_2186_Regression/Hello.cpp @@ -15,7 +15,7 @@ Hello::get_string (void) void Hello::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } void diff --git a/TAO/tests/Bug_2241_Regression/Hello.cpp b/TAO/tests/Bug_2241_Regression/Hello.cpp index 05ff299503e..69ad5eda998 100644 --- a/TAO/tests/Bug_2241_Regression/Hello.cpp +++ b/TAO/tests/Bug_2241_Regression/Hello.cpp @@ -26,5 +26,5 @@ Hello::shutdown (void) // call to this method before shutting down the ORB. We sleep // to avoid BAD_INV_ORDER exceptions on fast dual processor machines. ACE_OS::sleep (1); - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Bug_2328_Regression/Hello.cpp b/TAO/tests/Bug_2328_Regression/Hello.cpp index 116df3251b6..fbe2727b368 100644 --- a/TAO/tests/Bug_2328_Regression/Hello.cpp +++ b/TAO/tests/Bug_2328_Regression/Hello.cpp @@ -15,5 +15,5 @@ Hello::get_string (const char * A, const char * B, const char * C) void Hello::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Bug_2356_Regression/ami_test_i.cpp b/TAO/tests/Bug_2356_Regression/ami_test_i.cpp index 85cb54c3d45..73cea2da610 100644 --- a/TAO/tests/Bug_2356_Regression/ami_test_i.cpp +++ b/TAO/tests/Bug_2356_Regression/ami_test_i.cpp @@ -38,6 +38,6 @@ AMI_Test_i::foo (CORBA::Long value) void AMI_Test_i::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Bug_2417_Regression/publisher_impl.cpp b/TAO/tests/Bug_2417_Regression/publisher_impl.cpp index 165830204e3..b7d1239cf03 100644 --- a/TAO/tests/Bug_2417_Regression/publisher_impl.cpp +++ b/TAO/tests/Bug_2417_Regression/publisher_impl.cpp @@ -145,6 +145,6 @@ void Publisher_impl::shutdown ( ) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); worker->terminate(); } diff --git a/TAO/tests/Bug_2417_Regression/subscriber_impl.cpp b/TAO/tests/Bug_2417_Regression/subscriber_impl.cpp index 6d50931dbd6..fb0af4e411f 100644 --- a/TAO/tests/Bug_2417_Regression/subscriber_impl.cpp +++ b/TAO/tests/Bug_2417_Regression/subscriber_impl.cpp @@ -27,5 +27,5 @@ Subscriber_impl::isAlive () void Subscriber_impl::shutdown() { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Bug_2429_Regression/server.cpp b/TAO/tests/Bug_2429_Regression/server.cpp index 03c918f43e9..c03998bd712 100644 --- a/TAO/tests/Bug_2429_Regression/server.cpp +++ b/TAO/tests/Bug_2429_Regression/server.cpp @@ -79,7 +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 (true, true); } catch (const CORBA::Exception& ex) { diff --git a/TAO/tests/Bug_2494_Regression/test_i.cpp b/TAO/tests/Bug_2494_Regression/test_i.cpp index ce913dc160a..16041c56416 100644 --- a/TAO/tests/Bug_2494_Regression/test_i.cpp +++ b/TAO/tests/Bug_2494_Regression/test_i.cpp @@ -19,5 +19,5 @@ Simple_Server_i::test_method (const char *x) void Simple_Server_i::shutdown () { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Bug_2503_Regression/test_i.cpp b/TAO/tests/Bug_2503_Regression/test_i.cpp index bcfdff9816f..c95290efda2 100644 --- a/TAO/tests/Bug_2503_Regression/test_i.cpp +++ b/TAO/tests/Bug_2503_Regression/test_i.cpp @@ -39,5 +39,5 @@ void test_i::shutdown (void) { if (!CORBA::is_nil (this->orb_.in ())) - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Bug_2593_Regression/Hello.cpp b/TAO/tests/Bug_2593_Regression/Hello.cpp index 733fe2bfcaf..0d000b9f195 100644 --- a/TAO/tests/Bug_2593_Regression/Hello.cpp +++ b/TAO/tests/Bug_2593_Regression/Hello.cpp @@ -14,5 +14,5 @@ Hello::get_string (void) void Hello::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Bug_2595_Regression/Hello.cpp b/TAO/tests/Bug_2595_Regression/Hello.cpp index efa87b0a8e4..b37ab6fb634 100644 --- a/TAO/tests/Bug_2595_Regression/Hello.cpp +++ b/TAO/tests/Bug_2595_Regression/Hello.cpp @@ -19,5 +19,5 @@ Hello::op ( void Hello::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Bug_2654_Regression/Hello.cpp b/TAO/tests/Bug_2654_Regression/Hello.cpp index a60a9b3d8fd..b54d333631a 100644 --- a/TAO/tests/Bug_2654_Regression/Hello.cpp +++ b/TAO/tests/Bug_2654_Regression/Hello.cpp @@ -6,7 +6,7 @@ ACE_THR_FUNC_RETURN killer (void *arg) CORBA::ORB_var orb = reinterpret_cast<CORBA::ORB_ptr> (arg); ACE_DEBUG ((LM_DEBUG,"(%P|%t) server exiting\n")); - orb->shutdown (1); + orb->shutdown (true); return 0; } diff --git a/TAO/tests/Bug_2677_Regression/DllORB.cpp b/TAO/tests/Bug_2677_Regression/DllORB.cpp index af994858e84..2df14afddd0 100644 --- a/TAO/tests/Bug_2677_Regression/DllORB.cpp +++ b/TAO/tests/Bug_2677_Regression/DllORB.cpp @@ -112,7 +112,7 @@ DllORB::fini (void) // attempt to protect against sporadic BAD_INV_ORDER exceptions ACE_OS::sleep (ACE_Time_Value (0, 500)); - mv_orb_->shutdown (1); + mv_orb_->shutdown (true); } catch (...) { diff --git a/TAO/tests/Bug_2678_Regression/server.cpp b/TAO/tests/Bug_2678_Regression/server.cpp index c81cf0d458c..1a40df86114 100644 --- a/TAO/tests/Bug_2678_Regression/server.cpp +++ b/TAO/tests/Bug_2678_Regression/server.cpp @@ -22,7 +22,7 @@ Test_impl::Test_impl (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) void Test_impl::shutdown(void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } AnySeq *Test_impl::RunTest(const AnySeq ¶ms) diff --git a/TAO/tests/Bug_2734_Regression/test_i.cpp b/TAO/tests/Bug_2734_Regression/test_i.cpp index 829ad2298e3..d615af9689d 100644 --- a/TAO/tests/Bug_2734_Regression/test_i.cpp +++ b/TAO/tests/Bug_2734_Regression/test_i.cpp @@ -37,5 +37,5 @@ Simple_Server_i::shutdown (void) { ACE_DEBUG ((LM_DEBUG, "server (%P) Received shutdown request from client\n")); - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Bug_2768_Regression/Messenger_i.cpp b/TAO/tests/Bug_2768_Regression/Messenger_i.cpp index ba5ee68a0d4..c8370491fd3 100644 --- a/TAO/tests/Bug_2768_Regression/Messenger_i.cpp +++ b/TAO/tests/Bug_2768_Regression/Messenger_i.cpp @@ -7,6 +7,6 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb) void Messenger_i::send (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Bug_2804_Regression/Hello.cpp b/TAO/tests/Bug_2804_Regression/Hello.cpp index b28f967a261..b1013a6061c 100644 --- a/TAO/tests/Bug_2804_Regression/Hello.cpp +++ b/TAO/tests/Bug_2804_Regression/Hello.cpp @@ -21,5 +21,5 @@ Hello::get_any (CORBA::Any const & the_any) void Hello::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Bug_2805_Regression/ami_test_i.cpp b/TAO/tests/Bug_2805_Regression/ami_test_i.cpp index 8b5cebc0352..08ca555dd4e 100644 --- a/TAO/tests/Bug_2805_Regression/ami_test_i.cpp +++ b/TAO/tests/Bug_2805_Regression/ami_test_i.cpp @@ -64,7 +64,7 @@ AMI_Test_i::foo (CORBA::Long_out out_l, void AMI_Test_i::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Bug_2844_Regression/Hello.cpp b/TAO/tests/Bug_2844_Regression/Hello.cpp index b28f967a261..b1013a6061c 100644 --- a/TAO/tests/Bug_2844_Regression/Hello.cpp +++ b/TAO/tests/Bug_2844_Regression/Hello.cpp @@ -21,5 +21,5 @@ Hello::get_any (CORBA::Any const & the_any) void Hello::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Bug_2909_Regression/ami_test_i.cpp b/TAO/tests/Bug_2909_Regression/ami_test_i.cpp index 5972f9c55fa..3e9f7c047f6 100644 --- a/TAO/tests/Bug_2909_Regression/ami_test_i.cpp +++ b/TAO/tests/Bug_2909_Regression/ami_test_i.cpp @@ -40,6 +40,6 @@ AMI_Test_i::foo (CORBA::Long value) void AMI_Test_i::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Bug_2918_Regression/Hello.cpp b/TAO/tests/Bug_2918_Regression/Hello.cpp index b28f967a261..b1013a6061c 100644 --- a/TAO/tests/Bug_2918_Regression/Hello.cpp +++ b/TAO/tests/Bug_2918_Regression/Hello.cpp @@ -21,5 +21,5 @@ Hello::get_any (CORBA::Any const & the_any) void Hello::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Bug_2936_Regression/DllORB.cpp b/TAO/tests/Bug_2936_Regression/DllORB.cpp index 156b5869e53..d67f1026da4 100644 --- a/TAO/tests/Bug_2936_Regression/DllORB.cpp +++ b/TAO/tests/Bug_2936_Regression/DllORB.cpp @@ -141,7 +141,7 @@ DllORB::fini () // attempt to protect against sporadic BAD_INV_ORDER exceptions ACE_OS::sleep (ACE_Time_Value (0, 500)); - mv_orb_->shutdown (1); + mv_orb_->shutdown (true); } catch (...) { diff --git a/TAO/tests/Bug_2966_Regression/Hello.cpp b/TAO/tests/Bug_2966_Regression/Hello.cpp index 2c55eb798a9..cd0f84a435b 100644 --- a/TAO/tests/Bug_2966_Regression/Hello.cpp +++ b/TAO/tests/Bug_2966_Regression/Hello.cpp @@ -15,5 +15,5 @@ Hello::get_string (void) void Hello::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Bug_3000_Regression/Service.cpp b/TAO/tests/Bug_3000_Regression/Service.cpp index 6c17ca72986..db024beb115 100644 --- a/TAO/tests/Bug_3000_Regression/Service.cpp +++ b/TAO/tests/Bug_3000_Regression/Service.cpp @@ -16,5 +16,5 @@ Service::shutdown (void) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Shuting down self (server)\n")); - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Bug_3068_Regression/test_i.cpp b/TAO/tests/Bug_3068_Regression/test_i.cpp index a493c19223a..cc2ff9cf0ab 100644 --- a/TAO/tests/Bug_3068_Regression/test_i.cpp +++ b/TAO/tests/Bug_3068_Regression/test_i.cpp @@ -14,7 +14,7 @@ void Callback_i::shutdown () { ACE_DEBUG ((LM_DEBUG, "Performing clean shutdown\n")); - this->orb_->shutdown (0); + this->orb_->shutdown (false); } void @@ -100,7 +100,7 @@ Caller::svc () try { ACE_OS::sleep (1); - this->orb_->shutdown (0); + this->orb_->shutdown (false); } catch (const CORBA::Exception &ex) { @@ -112,5 +112,5 @@ Caller::svc () void Simple_Server_i::shutdown () { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Bug_3108_Regression/test_i.cpp b/TAO/tests/Bug_3108_Regression/test_i.cpp index c6a8e7bc541..cebacc2a5a4 100644 --- a/TAO/tests/Bug_3108_Regression/test_i.cpp +++ b/TAO/tests/Bug_3108_Regression/test_i.cpp @@ -16,5 +16,5 @@ test_i::test_method () void test_i::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Bug_3163_Regression/server.cpp b/TAO/tests/Bug_3163_Regression/server.cpp index 98b0ee8494e..987ec1ea579 100644 --- a/TAO/tests/Bug_3163_Regression/server.cpp +++ b/TAO/tests/Bug_3163_Regression/server.cpp @@ -53,7 +53,7 @@ public: } void shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } private: diff --git a/TAO/tests/Bug_3251_Regression/DllOrb.cpp b/TAO/tests/Bug_3251_Regression/DllOrb.cpp index 3b52249e2b1..239d08aed73 100644 --- a/TAO/tests/Bug_3251_Regression/DllOrb.cpp +++ b/TAO/tests/Bug_3251_Regression/DllOrb.cpp @@ -99,7 +99,7 @@ DllOrb::fini (void) // attempt to protect against sporadic BAD_INV_ORDER exceptions ACE_OS::sleep (ACE_Time_Value (0, 500)); - mv_orb_->shutdown (1); + mv_orb_->shutdown (true); ACE_DEBUG ((LM_ERROR, ACE_TEXT ("wait() ...\n"))); // wait for our threads to finish diff --git a/TAO/tests/Bug_3276_Regression/test_i.cpp b/TAO/tests/Bug_3276_Regression/test_i.cpp index 4b0a86e9382..d441b746be4 100644 --- a/TAO/tests/Bug_3276_Regression/test_i.cpp +++ b/TAO/tests/Bug_3276_Regression/test_i.cpp @@ -17,5 +17,5 @@ Simple_Server_i::shutdown () { ACE_DEBUG ((LM_DEBUG, "Servant in process id (%P) received shutdown request. Complying...\n")); - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Bug_3299_Regression/Hello.cpp b/TAO/tests/Bug_3299_Regression/Hello.cpp index 08a66f4eb2b..0f49115aca0 100644 --- a/TAO/tests/Bug_3299_Regression/Hello.cpp +++ b/TAO/tests/Bug_3299_Regression/Hello.cpp @@ -23,5 +23,5 @@ Hello::get_string (void) void Hello::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Bug_3333_Regression/Hello.cpp b/TAO/tests/Bug_3333_Regression/Hello.cpp index 16f276e957c..bdfcac050fb 100644 --- a/TAO/tests/Bug_3333_Regression/Hello.cpp +++ b/TAO/tests/Bug_3333_Regression/Hello.cpp @@ -14,5 +14,5 @@ Hello::get_string () void Hello::shutdown () { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Bug_3384_Regression/Server_i.cpp b/TAO/tests/Bug_3384_Regression/Server_i.cpp index 8f25dbaffc7..9c9a314321e 100644 --- a/TAO/tests/Bug_3384_Regression/Server_i.cpp +++ b/TAO/tests/Bug_3384_Regression/Server_i.cpp @@ -21,6 +21,6 @@ void Server::request ( void Server::shutdown ( void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Bug_3384_Regression/client.cpp b/TAO/tests/Bug_3384_Regression/client.cpp index 7b090db5fd2..70a5ed3f812 100644 --- a/TAO/tests/Bug_3384_Regression/client.cpp +++ b/TAO/tests/Bug_3384_Regression/client.cpp @@ -174,7 +174,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) test_server->shutdown (); // shutdown worker - orb->shutdown (1); + orb->shutdown (true); worker.thr_mgr ()->wait (); diff --git a/TAO/tests/Bug_3430_Regression/Hello.cpp b/TAO/tests/Bug_3430_Regression/Hello.cpp index d37f0772af4..2e2666c0c72 100644 --- a/TAO/tests/Bug_3430_Regression/Hello.cpp +++ b/TAO/tests/Bug_3430_Regression/Hello.cpp @@ -15,5 +15,5 @@ Hello::method(Test::Hello_out r) void Hello::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Bug_3471_Regression/Hello.cpp b/TAO/tests/Bug_3471_Regression/Hello.cpp index 8784e87fb10..383b6049261 100644 --- a/TAO/tests/Bug_3471_Regression/Hello.cpp +++ b/TAO/tests/Bug_3471_Regression/Hello.cpp @@ -18,5 +18,5 @@ Hello::get_objects (void) void Hello::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Bug_3479_Regression/Hello.cpp b/TAO/tests/Bug_3479_Regression/Hello.cpp index 9eb011eec14..674e81b64e0 100644 --- a/TAO/tests/Bug_3479_Regression/Hello.cpp +++ b/TAO/tests/Bug_3479_Regression/Hello.cpp @@ -14,5 +14,5 @@ Hello::get_string (CORBA::String_out string_out) void Hello::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Bug_3499_Regression/DLL_TAO_Service.cpp b/TAO/tests/Bug_3499_Regression/DLL_TAO_Service.cpp index e6283b5bb5e..c1b1b21511a 100644 --- a/TAO/tests/Bug_3499_Regression/DLL_TAO_Service.cpp +++ b/TAO/tests/Bug_3499_Regression/DLL_TAO_Service.cpp @@ -48,7 +48,7 @@ int ACE_DLL_TAO_Service::fini (void) try { - this->orb_->shutdown (1); + this->orb_->shutdown (true); this->root_poa_->destroy (1, 1); this->orb_->destroy (); diff --git a/TAO/tests/Bug_3524_Regression/test_i.cpp b/TAO/tests/Bug_3524_Regression/test_i.cpp index 7491fe3ac95..30fd7e9185f 100644 --- a/TAO/tests/Bug_3524_Regression/test_i.cpp +++ b/TAO/tests/Bug_3524_Regression/test_i.cpp @@ -452,5 +452,5 @@ A_i::exc_method (::Test::string_field f) void A_i::shutdown () { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Bug_3531_Regression/test_i.cpp b/TAO/tests/Bug_3531_Regression/test_i.cpp index dd1e997fcc5..5748d90de35 100644 --- a/TAO/tests/Bug_3531_Regression/test_i.cpp +++ b/TAO/tests/Bug_3531_Regression/test_i.cpp @@ -73,5 +73,5 @@ Simple_Server_i::handle_timeout (const ACE_Time_Value &, void Simple_Server_i::shutdown () { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Bug_3542_Regression/DllOrb.cpp b/TAO/tests/Bug_3542_Regression/DllOrb.cpp index 6f155b5eb33..2dc87d62332 100644 --- a/TAO/tests/Bug_3542_Regression/DllOrb.cpp +++ b/TAO/tests/Bug_3542_Regression/DllOrb.cpp @@ -96,7 +96,7 @@ DllOrb::fini (void) // attempt to protect against sporadic BAD_INV_ORDER exceptions ACE_OS::sleep (ACE_Time_Value (0, 500)); - mv_orb_->shutdown (1); + mv_orb_->shutdown (true); ACE_DEBUG ((LM_ERROR, ACE_TEXT ("wait() ...\n"))); // wait for our threads to finish diff --git a/TAO/tests/Bug_3543_Regression/master.cpp b/TAO/tests/Bug_3543_Regression/master.cpp index 37d1cd17cc4..a9a80b01d2e 100644 --- a/TAO/tests/Bug_3543_Regression/master.cpp +++ b/TAO/tests/Bug_3543_Regression/master.cpp @@ -179,7 +179,7 @@ void Dispatcher_run(int id) if (id == 0) { ACE_DEBUG ((LM_DEBUG, "Shutting down ORB\n")); - orb->shutdown (1); + orb->shutdown (true); } } diff --git a/TAO/tests/Bug_3543_Regression/server.cpp b/TAO/tests/Bug_3543_Regression/server.cpp index 56865da0b98..951b1781947 100644 --- a/TAO/tests/Bug_3543_Regression/server.cpp +++ b/TAO/tests/Bug_3543_Regression/server.cpp @@ -43,7 +43,7 @@ public: virtual void shutdown () { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } private: CORBA::ORB_var orb_; diff --git a/TAO/tests/Bug_3547_Regression/Stock_Quoter_i.cpp b/TAO/tests/Bug_3547_Regression/Stock_Quoter_i.cpp index 751a23b473b..4e2e4cdaba3 100644 --- a/TAO/tests/Bug_3547_Regression/Stock_Quoter_i.cpp +++ b/TAO/tests/Bug_3547_Regression/Stock_Quoter_i.cpp @@ -13,7 +13,7 @@ Stock_Quoter_i::~Stock_Quoter_i () void Stock_Quoter_i::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } CORBA::Float Stock_Quoter_i::get_quote (const char* stock_id) diff --git a/TAO/tests/Bug_3553_Regression/Hello.cpp b/TAO/tests/Bug_3553_Regression/Hello.cpp index 733fe2bfcaf..0d000b9f195 100644 --- a/TAO/tests/Bug_3553_Regression/Hello.cpp +++ b/TAO/tests/Bug_3553_Regression/Hello.cpp @@ -14,5 +14,5 @@ Hello::get_string (void) void Hello::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Bug_3558_Regression/Hello.cpp b/TAO/tests/Bug_3558_Regression/Hello.cpp index c95b536fb39..789e72c09a4 100644 --- a/TAO/tests/Bug_3558_Regression/Hello.cpp +++ b/TAO/tests/Bug_3558_Regression/Hello.cpp @@ -17,5 +17,5 @@ Hello::get_string (void) void Hello::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Bug_3567_Regression/ami_test_i.cpp b/TAO/tests/Bug_3567_Regression/ami_test_i.cpp index 7be98ff1a72..6dbdd973f19 100644 --- a/TAO/tests/Bug_3567_Regression/ami_test_i.cpp +++ b/TAO/tests/Bug_3567_Regression/ami_test_i.cpp @@ -65,7 +65,7 @@ AMI_Test_i::foo (CORBA::Long_out out_l, void AMI_Test_i::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Bug_3598a_Regression/server.cpp b/TAO/tests/Bug_3598a_Regression/server.cpp index edb8c8fe14c..f9ddf6315dc 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 (true, true); orb->destroy (); diff --git a/TAO/tests/Bug_3636_Regression/Hello.cpp b/TAO/tests/Bug_3636_Regression/Hello.cpp index 733fe2bfcaf..0d000b9f195 100644 --- a/TAO/tests/Bug_3636_Regression/Hello.cpp +++ b/TAO/tests/Bug_3636_Regression/Hello.cpp @@ -14,5 +14,5 @@ Hello::get_string (void) void Hello::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Bug_3672_Regression/ami_test_i.cpp b/TAO/tests/Bug_3672_Regression/ami_test_i.cpp index 15bac8f35a5..4c15a619ad5 100644 --- a/TAO/tests/Bug_3672_Regression/ami_test_i.cpp +++ b/TAO/tests/Bug_3672_Regression/ami_test_i.cpp @@ -35,6 +35,6 @@ AMI_Test_i::shutdown (void) { ACE_OS::sleep (5); - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Bug_3676_Regression/Hello.cpp b/TAO/tests/Bug_3676_Regression/Hello.cpp index 733fe2bfcaf..0d000b9f195 100644 --- a/TAO/tests/Bug_3676_Regression/Hello.cpp +++ b/TAO/tests/Bug_3676_Regression/Hello.cpp @@ -14,5 +14,5 @@ Hello::get_string (void) void Hello::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Bug_3746_Regression/Test_i.cpp b/TAO/tests/Bug_3746_Regression/Test_i.cpp index d7b45432f6a..0bc3f69157e 100644 --- a/TAO/tests/Bug_3746_Regression/Test_i.cpp +++ b/TAO/tests/Bug_3746_Regression/Test_i.cpp @@ -17,5 +17,5 @@ BoundSequences::BoundSequences (CORBA::ORB_ptr orb) void BoundSequences::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Bug_3748_Regression/Hello.cpp b/TAO/tests/Bug_3748_Regression/Hello.cpp index 733fe2bfcaf..0d000b9f195 100644 --- a/TAO/tests/Bug_3748_Regression/Hello.cpp +++ b/TAO/tests/Bug_3748_Regression/Hello.cpp @@ -14,5 +14,5 @@ Hello::get_string (void) void Hello::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Bug_3790_Regression/simple_test_i.cpp b/TAO/tests/Bug_3790_Regression/simple_test_i.cpp index 1891762834c..ff2df5d99e8 100644 --- a/TAO/tests/Bug_3790_Regression/simple_test_i.cpp +++ b/TAO/tests/Bug_3790_Regression/simple_test_i.cpp @@ -9,5 +9,5 @@ Simple_Test_i::Simple_Test_i (CORBA::ORB_ptr orb) void Simple_Test_i::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Bug_3801_Regression/ami_test_i.cpp b/TAO/tests/Bug_3801_Regression/ami_test_i.cpp index 18455f204c3..c01e37c4f96 100644 --- a/TAO/tests/Bug_3801_Regression/ami_test_i.cpp +++ b/TAO/tests/Bug_3801_Regression/ami_test_i.cpp @@ -29,7 +29,7 @@ AMI_Test_i::inout_arg_test (char *&) void AMI_Test_i::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } CORBA::Long diff --git a/TAO/tests/Bug_3837_Regression/Hello.cpp b/TAO/tests/Bug_3837_Regression/Hello.cpp index 733fe2bfcaf..0d000b9f195 100644 --- a/TAO/tests/Bug_3837_Regression/Hello.cpp +++ b/TAO/tests/Bug_3837_Regression/Hello.cpp @@ -14,5 +14,5 @@ Hello::get_string (void) void Hello::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Bug_3853_Regression/Hello_i.cpp b/TAO/tests/Bug_3853_Regression/Hello_i.cpp index 1dfc25c5da6..f168b54de74 100644 --- a/TAO/tests/Bug_3853_Regression/Hello_i.cpp +++ b/TAO/tests/Bug_3853_Regression/Hello_i.cpp @@ -23,7 +23,7 @@ void Demo_HelloWorld_i::shutdown() { ACE_DEBUG ((LM_DEBUG, "(%P|%t)Demo_HelloWorld_i::shutdown \n")); - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Bug_3896_Regression/Hello.cpp b/TAO/tests/Bug_3896_Regression/Hello.cpp index ee3b10eac8d..1222840c1fc 100644 --- a/TAO/tests/Bug_3896_Regression/Hello.cpp +++ b/TAO/tests/Bug_3896_Regression/Hello.cpp @@ -17,5 +17,5 @@ Hello::get_string (void) void Hello::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Bug_3919_Regression/Hello.cpp b/TAO/tests/Bug_3919_Regression/Hello.cpp index b28f967a261..b1013a6061c 100644 --- a/TAO/tests/Bug_3919_Regression/Hello.cpp +++ b/TAO/tests/Bug_3919_Regression/Hello.cpp @@ -21,5 +21,5 @@ Hello::get_any (CORBA::Any const & the_any) void Hello::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Bug_3926_Regression/test_i.cpp b/TAO/tests/Bug_3926_Regression/test_i.cpp index f0afd143e1c..ba410931390 100644 --- a/TAO/tests/Bug_3926_Regression/test_i.cpp +++ b/TAO/tests/Bug_3926_Regression/test_i.cpp @@ -40,5 +40,5 @@ test_i::shutdown (void) ACE_DEBUG ((LM_DEBUG, "SERVER: Server is shutting down at %d.\n", this->number_)); - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Bug_3953_Regression/server_i.cpp b/TAO/tests/Bug_3953_Regression/server_i.cpp index 2fb5b3cd48c..1c0ec440d7f 100644 --- a/TAO/tests/Bug_3953_Regression/server_i.cpp +++ b/TAO/tests/Bug_3953_Regression/server_i.cpp @@ -50,5 +50,5 @@ server_i::ping (CORBA::UShort time_to_live) void server_i::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Bug_3954_Regression/Hello.cpp b/TAO/tests/Bug_3954_Regression/Hello.cpp index 733fe2bfcaf..0d000b9f195 100644 --- a/TAO/tests/Bug_3954_Regression/Hello.cpp +++ b/TAO/tests/Bug_3954_Regression/Hello.cpp @@ -14,5 +14,5 @@ Hello::get_string (void) void Hello::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Bug_4010_Regression/Hello.cpp b/TAO/tests/Bug_4010_Regression/Hello.cpp index 733fe2bfcaf..0d000b9f195 100644 --- a/TAO/tests/Bug_4010_Regression/Hello.cpp +++ b/TAO/tests/Bug_4010_Regression/Hello.cpp @@ -14,5 +14,5 @@ Hello::get_string (void) void Hello::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Bug_4059_Regression/Hello.cpp b/TAO/tests/Bug_4059_Regression/Hello.cpp index 733fe2bfcaf..0d000b9f195 100644 --- a/TAO/tests/Bug_4059_Regression/Hello.cpp +++ b/TAO/tests/Bug_4059_Regression/Hello.cpp @@ -14,5 +14,5 @@ Hello::get_string (void) void Hello::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Bug_4213_Regression/Hello.cpp b/TAO/tests/Bug_4213_Regression/Hello.cpp index 733fe2bfcaf..0d000b9f195 100644 --- a/TAO/tests/Bug_4213_Regression/Hello.cpp +++ b/TAO/tests/Bug_4213_Regression/Hello.cpp @@ -14,5 +14,5 @@ Hello::get_string (void) void Hello::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Bug_933_Regression/Messenger_i.cpp b/TAO/tests/Bug_933_Regression/Messenger_i.cpp index bbc91d00fed..716c221810b 100644 --- a/TAO/tests/Bug_933_Regression/Messenger_i.cpp +++ b/TAO/tests/Bug_933_Regression/Messenger_i.cpp @@ -54,5 +54,5 @@ Messenger_i::send_message (const CORBA::OctetSeq & user_name) void Messenger_i::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/COIOP/Hello.cpp b/TAO/tests/COIOP/Hello.cpp index 78d9023ccef..5874626a298 100644 --- a/TAO/tests/COIOP/Hello.cpp +++ b/TAO/tests/COIOP/Hello.cpp @@ -62,5 +62,5 @@ Hello::shutdown (void) // call to this method before shutting down the ORB. We sleep // to avoid BAD_INV_ORDER exceptions on fast dual processor machines. ACE_OS::sleep (1); - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.cpp index 733fe2bfcaf..0d000b9f195 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.cpp @@ -14,5 +14,5 @@ Hello::get_string (void) void Hello::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Cache_Growth_Test/Hello.cpp b/TAO/tests/Cache_Growth_Test/Hello.cpp index 02e9b557bb5..1757a64b002 100644 --- a/TAO/tests/Cache_Growth_Test/Hello.cpp +++ b/TAO/tests/Cache_Growth_Test/Hello.cpp @@ -23,5 +23,5 @@ Hello::get_string (void) void Hello::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/CallbackTest/Callback.cpp b/TAO/tests/CallbackTest/Callback.cpp index b12a7b10e8f..a72878e305a 100644 --- a/TAO/tests/CallbackTest/Callback.cpp +++ b/TAO/tests/CallbackTest/Callback.cpp @@ -29,5 +29,5 @@ Callback::shutdown (void) ACE_DEBUG ((LM_DEBUG, "(%P|%t) Callback - shutdown!\n")); - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/CallbackTest/Service.cpp b/TAO/tests/CallbackTest/Service.cpp index 96a20024185..7b7cad946e0 100644 --- a/TAO/tests/CallbackTest/Service.cpp +++ b/TAO/tests/CallbackTest/Service.cpp @@ -44,7 +44,7 @@ Service::run_test (Test::Callback_ptr callback) } // shutdown ourselves - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/ClientPortSpan/Hello.cpp b/TAO/tests/ClientPortSpan/Hello.cpp index 733fe2bfcaf..0d000b9f195 100644 --- a/TAO/tests/ClientPortSpan/Hello.cpp +++ b/TAO/tests/ClientPortSpan/Hello.cpp @@ -14,5 +14,5 @@ Hello::get_string (void) void Hello::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Client_Leaks/Process.cpp b/TAO/tests/Client_Leaks/Process.cpp index c05907a1a3e..1c6fb507e19 100644 --- a/TAO/tests/Client_Leaks/Process.cpp +++ b/TAO/tests/Client_Leaks/Process.cpp @@ -15,5 +15,5 @@ Process::get_process_id (void) void Process::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Client_Leaks/Process_Factory.cpp b/TAO/tests/Client_Leaks/Process_Factory.cpp index da18c6c30ac..c090c004da1 100644 --- a/TAO/tests/Client_Leaks/Process_Factory.cpp +++ b/TAO/tests/Client_Leaks/Process_Factory.cpp @@ -109,5 +109,5 @@ void Process_Factory::shutdown (void) { this->shutdown_received_ = 1; - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/CodeSets/simple/server.cpp b/TAO/tests/CodeSets/simple/server.cpp index efe705de3ad..3599ee95ef2 100644 --- a/TAO/tests/CodeSets/simple/server.cpp +++ b/TAO/tests/CodeSets/simple/server.cpp @@ -87,7 +87,7 @@ public: //FUZZ: disable check_for_lack_ACE_OS void shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); }; //FUZZ: enable check_for_lack_ACE_OS diff --git a/TAO/tests/Collocated_Best/Collocated_Best_Direct/Hello.cpp b/TAO/tests/Collocated_Best/Collocated_Best_Direct/Hello.cpp index afb3cb8c933..15951f28767 100644 --- a/TAO/tests/Collocated_Best/Collocated_Best_Direct/Hello.cpp +++ b/TAO/tests/Collocated_Best/Collocated_Best_Direct/Hello.cpp @@ -63,5 +63,5 @@ Hello::shutdown (void) // call to this method before shutting down the ORB. We sleep // to avoid BAD_INV_ORDER exceptions on fast dual processor machines. ACE_OS::sleep (1); - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Hello.cpp b/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Hello.cpp index 8941c49f734..b0feddd2c8e 100644 --- a/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Hello.cpp +++ b/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Hello.cpp @@ -69,5 +69,5 @@ Hello::shutdown (void) // call to this method before shutting down the ORB. We sleep // to avoid BAD_INV_ORDER exceptions on fast dual processor machines. ACE_OS::sleep (1); - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Hello.cpp b/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Hello.cpp index 2188d4d09a6..dabc25cce11 100644 --- a/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Hello.cpp +++ b/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Hello.cpp @@ -61,5 +61,5 @@ Hello::shutdown (void) // call to this method before shutting down the ORB. We sleep // to avoid BAD_INV_ORDER exceptions on fast dual processor machines. ACE_OS::sleep (1); - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Collocated_DerivedIF/Hello.cpp b/TAO/tests/Collocated_DerivedIF/Hello.cpp index 400c6b2a709..93aa2c63755 100644 --- a/TAO/tests/Collocated_DerivedIF/Hello.cpp +++ b/TAO/tests/Collocated_DerivedIF/Hello.cpp @@ -75,6 +75,6 @@ HelloAgain::shutdown (void) // call to this method before shutting down the ORB. We sleep // to avoid BAD_INV_ORDER exceptions on fast dual processor machines. ACE_OS::sleep (1); - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Collocated_NoColl/Hello.cpp b/TAO/tests/Collocated_NoColl/Hello.cpp index 8941c49f734..b0feddd2c8e 100644 --- a/TAO/tests/Collocated_NoColl/Hello.cpp +++ b/TAO/tests/Collocated_NoColl/Hello.cpp @@ -69,5 +69,5 @@ Hello::shutdown (void) // call to this method before shutting down the ORB. We sleep // to avoid BAD_INV_ORDER exceptions on fast dual processor machines. ACE_OS::sleep (1); - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Collocated_ThruP_Sp/Hello.cpp b/TAO/tests/Collocated_ThruP_Sp/Hello.cpp index 8613b8172b3..81c4b023077 100644 --- a/TAO/tests/Collocated_ThruP_Sp/Hello.cpp +++ b/TAO/tests/Collocated_ThruP_Sp/Hello.cpp @@ -25,5 +25,5 @@ Hello::shutdown (void) // call to this method before shutting down the ORB. We sleep // to avoid BAD_INV_ORDER exceptions on fast dual processor machines. ACE_OS::sleep (1); - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Collocated_ThruP_Sp_Gd/Hello.cpp b/TAO/tests/Collocated_ThruP_Sp_Gd/Hello.cpp index 8613b8172b3..81c4b023077 100644 --- a/TAO/tests/Collocated_ThruP_Sp_Gd/Hello.cpp +++ b/TAO/tests/Collocated_ThruP_Sp_Gd/Hello.cpp @@ -25,5 +25,5 @@ Hello::shutdown (void) // call to this method before shutting down the ORB. We sleep // to avoid BAD_INV_ORDER exceptions on fast dual processor machines. ACE_OS::sleep (1); - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Collocation_Exception_Test/Hello.cpp b/TAO/tests/Collocation_Exception_Test/Hello.cpp index 4cbd97bc1e0..5151daaab6f 100644 --- a/TAO/tests/Collocation_Exception_Test/Hello.cpp +++ b/TAO/tests/Collocation_Exception_Test/Hello.cpp @@ -80,5 +80,5 @@ Hello::get_string (void) void Hello::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Collocation_Oneway_Tests/Hello.cpp b/TAO/tests/Collocation_Oneway_Tests/Hello.cpp index 84b661ef194..aa0517f8dfd 100644 --- a/TAO/tests/Collocation_Oneway_Tests/Hello.cpp +++ b/TAO/tests/Collocation_Oneway_Tests/Hello.cpp @@ -65,5 +65,5 @@ Hello::get_string (void) void Hello::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.cpp b/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.cpp index 0f8e79e67e2..b2075321033 100644 --- a/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.cpp +++ b/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.cpp @@ -252,7 +252,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) base_test->method (); - orb->shutdown (1); + orb->shutdown (true); result = task.wait (); ACE_ASSERT (result != -1); diff --git a/TAO/tests/Collocation_Tests/Hello.cpp b/TAO/tests/Collocation_Tests/Hello.cpp index 65b1c37b705..6def44732c1 100644 --- a/TAO/tests/Collocation_Tests/Hello.cpp +++ b/TAO/tests/Collocation_Tests/Hello.cpp @@ -60,5 +60,5 @@ Hello::shutdown (void) // call to this method before shutting down the ORB. We sleep // to avoid BAD_INV_ORDER exceptions on fast dual processor machines. ACE_OS::sleep (1); - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Connect_Strategy_Test/Hello.cpp b/TAO/tests/Connect_Strategy_Test/Hello.cpp index 733fe2bfcaf..0d000b9f195 100644 --- a/TAO/tests/Connect_Strategy_Test/Hello.cpp +++ b/TAO/tests/Connect_Strategy_Test/Hello.cpp @@ -14,5 +14,5 @@ Hello::get_string (void) void Hello::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Connection_Purging/client.cpp b/TAO/tests/Connection_Purging/client.cpp index eef190eeaa0..5e9d5a9f647 100644 --- a/TAO/tests/Connection_Purging/client.cpp +++ b/TAO/tests/Connection_Purging/client.cpp @@ -95,7 +95,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) } } - orb->shutdown (1); + orb->shutdown (true); orb->destroy (); } diff --git a/TAO/tests/DII_AMI_Forward/test_i.cpp b/TAO/tests/DII_AMI_Forward/test_i.cpp index ca593687f77..9707a29653a 100644 --- a/TAO/tests/DII_AMI_Forward/test_i.cpp +++ b/TAO/tests/DII_AMI_Forward/test_i.cpp @@ -19,5 +19,5 @@ void Forward_Test_i::shutdown () { ACE_OS::sleep( 2 ); - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/DII_Collocation_Tests/oneway/Hello.cpp b/TAO/tests/DII_Collocation_Tests/oneway/Hello.cpp index 128f6d994db..628c447dbe2 100644 --- a/TAO/tests/DII_Collocation_Tests/oneway/Hello.cpp +++ b/TAO/tests/DII_Collocation_Tests/oneway/Hello.cpp @@ -330,7 +330,7 @@ Hello::shutdown (void) // call to this method before shutting down the ORB. We sleep // to avoid BAD_INV_ORDER exceptions on fast dual processor machines. ACE_OS::sleep (1); - this->orb_->shutdown (0); + this->orb_->shutdown (false); } CORBA::ULong Hello::error_count () const diff --git a/TAO/tests/DII_Collocation_Tests/twoway/Hello.cpp b/TAO/tests/DII_Collocation_Tests/twoway/Hello.cpp index a6c02d96bd3..7d1ea2c57a1 100644 --- a/TAO/tests/DII_Collocation_Tests/twoway/Hello.cpp +++ b/TAO/tests/DII_Collocation_Tests/twoway/Hello.cpp @@ -347,7 +347,7 @@ Hello::shutdown (void) // call to this method before shutting down the ORB. We sleep // to avoid BAD_INV_ORDER exceptions on fast dual processor machines. ACE_OS::sleep (1); - this->orb_->shutdown (0); + this->orb_->shutdown (false); } CORBA::ULong Hello::error_count () const diff --git a/TAO/tests/DII_Discard_Deferred/Hello.cpp b/TAO/tests/DII_Discard_Deferred/Hello.cpp index d889c5adf32..a2c5103edc3 100644 --- a/TAO/tests/DII_Discard_Deferred/Hello.cpp +++ b/TAO/tests/DII_Discard_Deferred/Hello.cpp @@ -19,5 +19,5 @@ Hello::get_string (void) void Hello::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/DLL_ORB/Test_i.cpp b/TAO/tests/DLL_ORB/Test_i.cpp index 88e93855c0d..8f808922e71 100644 --- a/TAO/tests/DLL_ORB/Test_i.cpp +++ b/TAO/tests/DLL_ORB/Test_i.cpp @@ -20,7 +20,7 @@ Test_i::shutdown (void) "Server is shutting down.\n")); if (!CORBA::is_nil (this->orb_.in ())) - this->orb_->shutdown (0); + this->orb_->shutdown (false); } void diff --git a/TAO/tests/DSI_AMH/Roundtrip.cpp b/TAO/tests/DSI_AMH/Roundtrip.cpp index aee804eb5dd..42bade8aa5a 100644 --- a/TAO/tests/DSI_AMH/Roundtrip.cpp +++ b/TAO/tests/DSI_AMH/Roundtrip.cpp @@ -19,7 +19,7 @@ Roundtrip::invoke (CORBA::ServerRequest_ptr request, { if (ACE_OS::strcmp ("shutdown", request->operation ()) == 0) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); return; } diff --git a/TAO/tests/DSI_AMI_Gateway/test_dsi.cpp b/TAO/tests/DSI_AMI_Gateway/test_dsi.cpp index fae8cacfd73..225b4a3475e 100644 --- a/TAO/tests/DSI_AMI_Gateway/test_dsi.cpp +++ b/TAO/tests/DSI_AMI_Gateway/test_dsi.cpp @@ -118,7 +118,7 @@ DSI_Simple_Server::invoke (CORBA::ServerRequest_ptr request, if (ACE_OS::strcmp ("shutdown", request->operation ()) == 0) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } } diff --git a/TAO/tests/DSI_AMI_Gateway/test_i.cpp b/TAO/tests/DSI_AMI_Gateway/test_i.cpp index 24445c85741..b2a50ab519d 100644 --- a/TAO/tests/DSI_AMI_Gateway/test_i.cpp +++ b/TAO/tests/DSI_AMI_Gateway/test_i.cpp @@ -47,7 +47,7 @@ Simple_Server_i::raise_system_exception (void) void Simple_Server_i::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } CORBA::Long diff --git a/TAO/tests/DSI_Gateway/test_dsi.cpp b/TAO/tests/DSI_Gateway/test_dsi.cpp index 1ab1810fd52..379110de503 100644 --- a/TAO/tests/DSI_Gateway/test_dsi.cpp +++ b/TAO/tests/DSI_Gateway/test_dsi.cpp @@ -50,7 +50,7 @@ DSI_Simple_Server::invoke (CORBA::ServerRequest_ptr request) if (ACE_OS::strcmp ("shutdown", request->operation ()) == 0) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } } diff --git a/TAO/tests/DSI_Gateway/test_i.cpp b/TAO/tests/DSI_Gateway/test_i.cpp index 24445c85741..b2a50ab519d 100644 --- a/TAO/tests/DSI_Gateway/test_i.cpp +++ b/TAO/tests/DSI_Gateway/test_i.cpp @@ -47,7 +47,7 @@ Simple_Server_i::raise_system_exception (void) void Simple_Server_i::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } CORBA::Long diff --git a/TAO/tests/DiffServ/server.cpp b/TAO/tests/DiffServ/server.cpp index 138e4d77c3f..53e4301c8b6 100644 --- a/TAO/tests/DiffServ/server.cpp +++ b/TAO/tests/DiffServ/server.cpp @@ -86,7 +86,7 @@ Test_i::test_method (void) void Test_i::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } static const ACE_TCHAR *simple_servant_ior_file = ACE_TEXT("simple_servant.ior"); diff --git a/TAO/tests/DynAny_Test/data.cpp b/TAO/tests/DynAny_Test/data.cpp index 437237b123f..fb680eab82a 100644 --- a/TAO/tests/DynAny_Test/data.cpp +++ b/TAO/tests/DynAny_Test/data.cpp @@ -90,7 +90,7 @@ Data::Data (CORBA::ORB_var orb) root_poa->create_reference ("foo"); // Clean up after the POA - root_poa->destroy (1, 1); + root_poa->destroy (true, true); } catch (const CORBA::Exception& ex) { diff --git a/TAO/tests/Dynamic_TP/ORB_ThreadPool/Test_i.cpp b/TAO/tests/Dynamic_TP/ORB_ThreadPool/Test_i.cpp index 02b682d2f10..7d330b5d366 100644 --- a/TAO/tests/Dynamic_TP/ORB_ThreadPool/Test_i.cpp +++ b/TAO/tests/Dynamic_TP/ORB_ThreadPool/Test_i.cpp @@ -18,7 +18,7 @@ Sleeper_i::delay(CORBA::Short sec) void Sleeper_i::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } //----------------------------------------------- @@ -75,5 +75,5 @@ void Middle_i::shutdown (void) { sleeper_->shutdown (); - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/Hello.cpp b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/Hello.cpp index 299b0c4466b..19720e55059 100644 --- a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/Hello.cpp +++ b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/Hello.cpp @@ -36,5 +36,5 @@ Hello::get_string (CORBA::Long client_num) void Hello::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/Hello.cpp b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/Hello.cpp index 299b0c4466b..19720e55059 100644 --- a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/Hello.cpp +++ b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/Hello.cpp @@ -36,5 +36,5 @@ Hello::get_string (CORBA::Long client_num) void Hello::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Exposed_Policies/Policy_Tester.cpp b/TAO/tests/Exposed_Policies/Policy_Tester.cpp index 231982ae857..c7b3633a048 100644 --- a/TAO/tests/Exposed_Policies/Policy_Tester.cpp +++ b/TAO/tests/Exposed_Policies/Policy_Tester.cpp @@ -257,5 +257,5 @@ Policy_Tester::create_objects (void) void Policy_Tester::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/FL_Cube/test_i.cpp b/TAO/tests/FL_Cube/test_i.cpp index 14fc41808d6..205f563955b 100644 --- a/TAO/tests/FL_Cube/test_i.cpp +++ b/TAO/tests/FL_Cube/test_i.cpp @@ -24,7 +24,7 @@ Simple_Server_i::set_y_angle (CORBA::Long y) void Simple_Server_i::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } // **************************************************************** diff --git a/TAO/tests/Faults/ping_i.cpp b/TAO/tests/Faults/ping_i.cpp index 2fed44d1079..6be7b4ec2a9 100644 --- a/TAO/tests/Faults/ping_i.cpp +++ b/TAO/tests/Faults/ping_i.cpp @@ -18,7 +18,7 @@ PingObject_i::pong (void) void PingObject_i::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } PortableServer::POA_ptr diff --git a/TAO/tests/Faults/test_i.cpp b/TAO/tests/Faults/test_i.cpp index a55e19ca977..e88d859e42b 100644 --- a/TAO/tests/Faults/test_i.cpp +++ b/TAO/tests/Faults/test_i.cpp @@ -22,7 +22,7 @@ Callback_i::shutdown (CORBA::Boolean is_clean) #endif return; } - this->orb_->shutdown (0); + this->orb_->shutdown (false); ACE_DEBUG ((LM_DEBUG, "Shutdown: Performed clean shutdown\n")); } @@ -60,13 +60,13 @@ Simple_Server_i::shutdown_now (CORBA::Boolean is_clean) } ACE_DEBUG ((LM_DEBUG, "shutdown_now:Performing clean shutdown\n")); - this->orb_->shutdown (0); + this->orb_->shutdown (false); } void Simple_Server_i::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } // **************************************************************** @@ -116,5 +116,5 @@ Middle_i::shutdown (void) // ignore them } - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/ForwardOnceUponException/test_i.cpp b/TAO/tests/ForwardOnceUponException/test_i.cpp index c94f6f039f9..c77bd7b2527 100644 --- a/TAO/tests/ForwardOnceUponException/test_i.cpp +++ b/TAO/tests/ForwardOnceUponException/test_i.cpp @@ -41,5 +41,5 @@ Simple_Server_i::test_is_a (const char * /* type */) void Simple_Server_i::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/ForwardUponObjectNotExist/test_i.cpp b/TAO/tests/ForwardUponObjectNotExist/test_i.cpp index 4e447fad05e..0fd5c7419c4 100644 --- a/TAO/tests/ForwardUponObjectNotExist/test_i.cpp +++ b/TAO/tests/ForwardUponObjectNotExist/test_i.cpp @@ -15,5 +15,5 @@ Simple_Server_i::test_is_a (const char * /* type */) void Simple_Server_i::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Forwarding/test_i.cpp b/TAO/tests/Forwarding/test_i.cpp index 2b0a449a165..a5df35f5892 100644 --- a/TAO/tests/Forwarding/test_i.cpp +++ b/TAO/tests/Forwarding/test_i.cpp @@ -14,5 +14,5 @@ Simple_Server_i::test_is_a (const char * /* type */) void Simple_Server_i::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.cpp b/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.cpp index e9e7dbf5846..ff03f1a2de6 100644 --- a/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.cpp +++ b/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.cpp @@ -25,7 +25,7 @@ Payload_Receiver::more_data (const Test::Payload &payload) void Payload_Receiver::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.cpp b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.cpp index e9e7dbf5846..ff03f1a2de6 100644 --- a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.cpp +++ b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.cpp @@ -25,7 +25,7 @@ Payload_Receiver::more_data (const Test::Payload &payload) void Payload_Receiver::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Hello/Hello.cpp b/TAO/tests/Hello/Hello.cpp index 733fe2bfcaf..0d000b9f195 100644 --- a/TAO/tests/Hello/Hello.cpp +++ b/TAO/tests/Hello/Hello.cpp @@ -14,5 +14,5 @@ Hello::get_string (void) void Hello::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/ICMG_Any_Bug/Hello.cpp b/TAO/tests/ICMG_Any_Bug/Hello.cpp index 8d31a00870f..efb6ab0ec87 100644 --- a/TAO/tests/ICMG_Any_Bug/Hello.cpp +++ b/TAO/tests/ICMG_Any_Bug/Hello.cpp @@ -27,5 +27,5 @@ Hello::get_helloworld (void) void Hello::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/IORTable_Locator/simple_test_i.cpp b/TAO/tests/IORTable_Locator/simple_test_i.cpp index 1891762834c..ff2df5d99e8 100644 --- a/TAO/tests/IORTable_Locator/simple_test_i.cpp +++ b/TAO/tests/IORTable_Locator/simple_test_i.cpp @@ -9,5 +9,5 @@ Simple_Test_i::Simple_Test_i (CORBA::ORB_ptr orb) void Simple_Test_i::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/IPV6/Hello.cpp b/TAO/tests/IPV6/Hello.cpp index 733fe2bfcaf..0d000b9f195 100644 --- a/TAO/tests/IPV6/Hello.cpp +++ b/TAO/tests/IPV6/Hello.cpp @@ -14,5 +14,5 @@ Hello::get_string (void) void Hello::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Leader_Followers/server.cpp b/TAO/tests/Leader_Followers/server.cpp index 72f9cf8ccd3..73a7e5f0525 100644 --- a/TAO/tests/Leader_Followers/server.cpp +++ b/TAO/tests/Leader_Followers/server.cpp @@ -129,7 +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 (true, true); } catch (const CORBA::Exception& ex) { diff --git a/TAO/tests/Leader_Followers/test_i.cpp b/TAO/tests/Leader_Followers/test_i.cpp index 99ec0e52d94..28473ad2c12 100644 --- a/TAO/tests/Leader_Followers/test_i.cpp +++ b/TAO/tests/Leader_Followers/test_i.cpp @@ -9,7 +9,7 @@ test_i::test_i (CORBA::ORB_ptr orb) void test_i::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } CORBA::ULong diff --git a/TAO/tests/LongDouble/LongDoubleTest.cpp b/TAO/tests/LongDouble/LongDoubleTest.cpp index 3a342d612ca..95be1d4be1a 100644 --- a/TAO/tests/LongDouble/LongDoubleTest.cpp +++ b/TAO/tests/LongDouble/LongDoubleTest.cpp @@ -17,5 +17,5 @@ LongDoubleTest::get_long_double () void LongDoubleTest::shutdown () { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/LongUpcalls/AMI_Manager.cpp b/TAO/tests/LongUpcalls/AMI_Manager.cpp index f9ef1abf663..74a64d7d924 100644 --- a/TAO/tests/LongUpcalls/AMI_Manager.cpp +++ b/TAO/tests/LongUpcalls/AMI_Manager.cpp @@ -46,7 +46,7 @@ AMI_Manager::start_workers (CORBA::Short worker_count, void AMI_Manager::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } // **************************************************************** diff --git a/TAO/tests/LongUpcalls/Manager.cpp b/TAO/tests/LongUpcalls/Manager.cpp index 6d6eac005d3..4f9923c80fb 100644 --- a/TAO/tests/LongUpcalls/Manager.cpp +++ b/TAO/tests/LongUpcalls/Manager.cpp @@ -45,7 +45,7 @@ Manager::start_workers (CORBA::Short worker_count, void Manager::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/MProfile/test_i.cpp b/TAO/tests/MProfile/test_i.cpp index 11c2da0f4e5..ac80f97ad7d 100644 --- a/TAO/tests/MProfile/test_i.cpp +++ b/TAO/tests/MProfile/test_i.cpp @@ -24,5 +24,5 @@ Simple_Server_i::remote_call (void) void Simple_Server_i::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/MProfile_Connection_Timeout/test_i.cpp b/TAO/tests/MProfile_Connection_Timeout/test_i.cpp index f6823143bf7..5a4aa60200a 100644 --- a/TAO/tests/MProfile_Connection_Timeout/test_i.cpp +++ b/TAO/tests/MProfile_Connection_Timeout/test_i.cpp @@ -30,5 +30,5 @@ Simple_Server_i::remote_call (void) void Simple_Server_i::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/MProfile_Forwarding/test_i.cpp b/TAO/tests/MProfile_Forwarding/test_i.cpp index a6f2fed50ff..8ae51e821ed 100644 --- a/TAO/tests/MProfile_Forwarding/test_i.cpp +++ b/TAO/tests/MProfile_Forwarding/test_i.cpp @@ -20,5 +20,5 @@ Simple_Server_i::remote_call (void) void Simple_Server_i::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/MT_BiDir/client.cpp b/TAO/tests/MT_BiDir/client.cpp index 14056b16ec7..58430f8754a 100644 --- a/TAO/tests/MT_BiDir/client.cpp +++ b/TAO/tests/MT_BiDir/client.cpp @@ -137,7 +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 (true, true); } catch (const CORBA::Exception& ex) { diff --git a/TAO/tests/MT_BiDir/server.cpp b/TAO/tests/MT_BiDir/server.cpp index 68a39ceda53..d69309da73e 100644 --- a/TAO/tests/MT_BiDir/server.cpp +++ b/TAO/tests/MT_BiDir/server.cpp @@ -163,7 +163,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& ex) { diff --git a/TAO/tests/MT_Client/test_i.cpp b/TAO/tests/MT_Client/test_i.cpp index 52f50251cf2..cca0271c9d0 100644 --- a/TAO/tests/MT_Client/test_i.cpp +++ b/TAO/tests/MT_Client/test_i.cpp @@ -12,5 +12,5 @@ Simple_Server_i::test_method (void) void Simple_Server_i::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/MT_Server/test_i.cpp b/TAO/tests/MT_Server/test_i.cpp index 9847377ea95..811469bdcca 100644 --- a/TAO/tests/MT_Server/test_i.cpp +++ b/TAO/tests/MT_Server/test_i.cpp @@ -19,5 +19,5 @@ Simple_Server_i::test_method (CORBA::Long x) void Simple_Server_i::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/MT_Timeout/Sleep_Service.cpp b/TAO/tests/MT_Timeout/Sleep_Service.cpp index c356908ea59..898b31179ed 100644 --- a/TAO/tests/MT_Timeout/Sleep_Service.cpp +++ b/TAO/tests/MT_Timeout/Sleep_Service.cpp @@ -20,5 +20,5 @@ void Sleep_Service::shutdown (void) { ACE_DEBUG ((LM_DEBUG, "Shutting down the ORB\n")); - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Mixed_Sync_ASync_Events/test_i.cpp b/TAO/tests/Mixed_Sync_ASync_Events/test_i.cpp index ff21e3f0965..2ee2f7a2ada 100644 --- a/TAO/tests/Mixed_Sync_ASync_Events/test_i.cpp +++ b/TAO/tests/Mixed_Sync_ASync_Events/test_i.cpp @@ -93,7 +93,7 @@ Test_i::shutdown (void) { this->opponent_->shutdown (); } - this->orb_->shutdown (0); + this->orb_->shutdown (false); } Test_Reply_i::Test_Reply_i (CORBA::ORB_ptr orb, diff --git a/TAO/tests/Multiple/Multiple_Impl.cpp b/TAO/tests/Multiple/Multiple_Impl.cpp index b451595ee00..29b3805061f 100644 --- a/TAO/tests/Multiple/Multiple_Impl.cpp +++ b/TAO/tests/Multiple/Multiple_Impl.cpp @@ -42,7 +42,7 @@ Bottom_Impl::bottom_quote ( ) void Bottom_Impl::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } /////////////////////////////////////////////////////////// @@ -110,5 +110,5 @@ Delegated_Bottom_Impl::shutdown (void) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Delegating Shut-Down.\n"))); this->delegate_->shutdown (); - //this->orb_->shutdown (0); + //this->orb_->shutdown (false); } diff --git a/TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/Hello.cpp b/TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/Hello.cpp index 4deb6598d9c..9c89eb5b0f1 100644 --- a/TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/Hello.cpp +++ b/TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/Hello.cpp @@ -21,5 +21,5 @@ Hello::set_string (const char * s) void Hello::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/test_i.cpp b/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/test_i.cpp index a0e5aedb34f..b178b81bafc 100644 --- a/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/test_i.cpp +++ b/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/test_i.cpp @@ -52,5 +52,5 @@ Simple_Server_i::test_is_a (const char * /* type */) void Simple_Server_i::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Muxed_GIOP_Versions/test_i.cpp b/TAO/tests/Muxed_GIOP_Versions/test_i.cpp index 66ba195352c..913354f274d 100644 --- a/TAO/tests/Muxed_GIOP_Versions/test_i.cpp +++ b/TAO/tests/Muxed_GIOP_Versions/test_i.cpp @@ -22,5 +22,5 @@ Simple_Server_i::shutdown (void) { // We dont shutdown the ORB. We allow the server to go away as it // wants. - // this->orb_->shutdown (0); + // this->orb_->shutdown (false); } diff --git a/TAO/tests/Muxing/Receiver.cpp b/TAO/tests/Muxing/Receiver.cpp index e0cf3c1c60f..18afcfde8b4 100644 --- a/TAO/tests/Muxing/Receiver.cpp +++ b/TAO/tests/Muxing/Receiver.cpp @@ -36,5 +36,5 @@ Receiver::get_event_count (void) void Receiver::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/NestedUpcall/Simple/client.cpp b/TAO/tests/NestedUpcall/Simple/client.cpp index 9b2944ef75d..3195d21086d 100644 --- a/TAO/tests/NestedUpcall/Simple/client.cpp +++ b/TAO/tests/NestedUpcall/Simple/client.cpp @@ -151,7 +151,7 @@ ACE_TMAIN (int argc, server->shutdown (); } - root_poa->destroy (1, 1); + root_poa->destroy (true, true); } catch (const CORBA::Exception& ex) { diff --git a/TAO/tests/NestedUpcall/Simple/server_i.cpp b/TAO/tests/NestedUpcall/Simple/server_i.cpp index ca14337b876..7c72d7f57aa 100644 --- a/TAO/tests/NestedUpcall/Simple/server_i.cpp +++ b/TAO/tests/NestedUpcall/Simple/server_i.cpp @@ -36,5 +36,5 @@ server_i::ping (CORBA::UShort time_to_live) void server_i::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/NestedUpcall/Simple/simple-client.cpp b/TAO/tests/NestedUpcall/Simple/simple-client.cpp index 45c8083fa8c..3210aa23441 100644 --- a/TAO/tests/NestedUpcall/Simple/simple-client.cpp +++ b/TAO/tests/NestedUpcall/Simple/simple-client.cpp @@ -159,7 +159,7 @@ ACT_TMAIN (int argc, ACE_TCHAR **argv) server->shutdown (); } - root_poa->destroy (1, 1); + root_poa->destroy (true, true); } catch (const CORBA::Exception& ex) { diff --git a/TAO/tests/Nested_Event_Loop/client.cpp b/TAO/tests/Nested_Event_Loop/client.cpp index 8e3c828ff67..418f0f450ac 100644 --- a/TAO/tests/Nested_Event_Loop/client.cpp +++ b/TAO/tests/Nested_Event_Loop/client.cpp @@ -110,7 +110,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) server_object->shutdown (); } - root_poa->destroy (1, 1); + root_poa->destroy (true, true); } catch (const CORBA::Exception& ex) { diff --git a/TAO/tests/Nested_Event_Loop/server.cpp b/TAO/tests/Nested_Event_Loop/server.cpp index 61654b57cff..5bd09c49ff3 100644 --- a/TAO/tests/Nested_Event_Loop/server.cpp +++ b/TAO/tests/Nested_Event_Loop/server.cpp @@ -81,7 +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); orb->destroy (); } diff --git a/TAO/tests/Nested_Event_Loop/test_i.cpp b/TAO/tests/Nested_Event_Loop/test_i.cpp index 26856a86a83..ab3557f72a5 100644 --- a/TAO/tests/Nested_Event_Loop/test_i.cpp +++ b/TAO/tests/Nested_Event_Loop/test_i.cpp @@ -98,7 +98,7 @@ server_i::no_op (client_ptr remote_partner, void server_i::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } client_i::client_i (server_ptr remote_partner) diff --git a/TAO/tests/Nested_Upcall_Crash/Server_Peer.cpp b/TAO/tests/Nested_Upcall_Crash/Server_Peer.cpp index 37dafe521fe..3e47cfa1d28 100644 --- a/TAO/tests/Nested_Upcall_Crash/Server_Peer.cpp +++ b/TAO/tests/Nested_Upcall_Crash/Server_Peer.cpp @@ -39,7 +39,7 @@ Server_Peer::callme(Test::Peer_ptr callback, { } - // orb_->shutdown (0); + // orb_->shutdown (false); } else if (max_depth > 0) { diff --git a/TAO/tests/No_Server_MT_Connect_Test/test_i.cpp b/TAO/tests/No_Server_MT_Connect_Test/test_i.cpp index 50d71b99e44..fd5f7c68fb2 100644 --- a/TAO/tests/No_Server_MT_Connect_Test/test_i.cpp +++ b/TAO/tests/No_Server_MT_Connect_Test/test_i.cpp @@ -13,5 +13,5 @@ Simple_Server_i::test_method (void) void Simple_Server_i::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/OBV/Any/AnyS_impl.cpp b/TAO/tests/OBV/Any/AnyS_impl.cpp index 940f6962ce5..28a4c1b7463 100644 --- a/TAO/tests/OBV/Any/AnyS_impl.cpp +++ b/TAO/tests/OBV/Any/AnyS_impl.cpp @@ -53,5 +53,5 @@ Test_impl::get_vb() void Test_impl::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/OBV/Collocated/Forward/Test_impl.cpp b/TAO/tests/OBV/Collocated/Forward/Test_impl.cpp index 9e0fb1ab75a..a921535a4eb 100644 --- a/TAO/tests/OBV/Collocated/Forward/Test_impl.cpp +++ b/TAO/tests/OBV/Collocated/Forward/Test_impl.cpp @@ -38,5 +38,5 @@ Test_impl::reflect (TreeController * tc) void Test_impl::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/OBV/Factory/FactoryS_impl.cpp b/TAO/tests/OBV/Factory/FactoryS_impl.cpp index c9e250aa71d..169eaf05e43 100644 --- a/TAO/tests/OBV/Factory/FactoryS_impl.cpp +++ b/TAO/tests/OBV/Factory/FactoryS_impl.cpp @@ -42,5 +42,5 @@ Test_impl::get_value2 (void) void Test_impl::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/OBV/Forward/Test_impl.cpp b/TAO/tests/OBV/Forward/Test_impl.cpp index 9f65ab9bc71..ad571a516a8 100644 --- a/TAO/tests/OBV/Forward/Test_impl.cpp +++ b/TAO/tests/OBV/Forward/Test_impl.cpp @@ -39,5 +39,5 @@ Test_impl::reflect (TreeController * tc) void Test_impl::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/OBV/Supports/Supports_Test_impl.cpp b/TAO/tests/OBV/Supports/Supports_Test_impl.cpp index fa192f1d10b..9a2e94ade95 100644 --- a/TAO/tests/OBV/Supports/Supports_Test_impl.cpp +++ b/TAO/tests/OBV/Supports/Supports_Test_impl.cpp @@ -158,7 +158,7 @@ test_impl::start (void) void test_impl::finish (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/OBV/Truncatable/TruncatableS_impl.cpp b/TAO/tests/OBV/Truncatable/TruncatableS_impl.cpp index 8c774f71e24..b38e709023f 100644 --- a/TAO/tests/OBV/Truncatable/TruncatableS_impl.cpp +++ b/TAO/tests/OBV/Truncatable/TruncatableS_impl.cpp @@ -177,5 +177,5 @@ Test_impl::op5 (const CORBA::Any& val, void Test_impl::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/OBV/ValueBox/Test_impl.cpp b/TAO/tests/OBV/ValueBox/Test_impl.cpp index 7f6f0d2ceba..b3b1d97c0e1 100644 --- a/TAO/tests/OBV/ValueBox/Test_impl.cpp +++ b/TAO/tests/OBV/ValueBox/Test_impl.cpp @@ -479,5 +479,5 @@ Test_impl::union_op4 (const ::Variable_Union1 & p1, void Test_impl::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.cpp b/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.cpp index 7b5b18d717e..fdc3591ca8d 100644 --- a/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.cpp +++ b/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.cpp @@ -133,7 +133,7 @@ int DllOrb::fini (void) // attempt to protect against sporadic BAD_INV_ORDER exceptions ACE_OS::sleep(ACE_Time_Value(0, 500)); - mv_orb->shutdown(1); + mv_orb->shutdown(true); } catch(CORBA::Exception& ex) { diff --git a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test_i.cpp b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test_i.cpp index ad0080d389b..17607898770 100644 --- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test_i.cpp +++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test_i.cpp @@ -14,5 +14,5 @@ Hello::get_string (void) void Hello::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/client.cpp b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/client.cpp index d5717fabb68..f03731b60ee 100644 --- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/client.cpp +++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/client.cpp @@ -122,7 +122,7 @@ Client_Worker::test_main (int argc, ACE_TCHAR *argv[]) } } - orb->shutdown (0); + orb->shutdown (false); 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 dec8a68995a..e0fbd00ea37 100644 --- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/server.cpp +++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/server.cpp @@ -115,7 +115,7 @@ Server_Worker::test_main (int argc, ACE_TCHAR *argv[]) // During normal test execution the ORB would have been destroyed // by a request from the client. - // orb->shutdown (0); + // orb->shutdown (false); orb->destroy (); } diff --git a/TAO/tests/ORB_shutdown/Foo_Bar.cpp b/TAO/tests/ORB_shutdown/Foo_Bar.cpp index ec9cc2839da..22288154860 100644 --- a/TAO/tests/ORB_shutdown/Foo_Bar.cpp +++ b/TAO/tests/ORB_shutdown/Foo_Bar.cpp @@ -12,7 +12,7 @@ Foo_Bar::~Foo_Bar (void) try { - this->orb_->shutdown (1); + this->orb_->shutdown (true); } catch (...) { diff --git a/TAO/tests/ORB_shutdown/server.cpp b/TAO/tests/ORB_shutdown/server.cpp index b1292735fc7..22d0339e8ec 100644 --- a/TAO/tests/ORB_shutdown/server.cpp +++ b/TAO/tests/ORB_shutdown/server.cpp @@ -55,7 +55,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - shutting down the ORB\n")); - orb->shutdown (1); + orb->shutdown (true); ACE_DEBUG ((LM_DEBUG, "(%P|%t) Finished shutting down the ORB\n")); diff --git a/TAO/tests/ORT/ORT_test_i.cpp b/TAO/tests/ORT/ORT_test_i.cpp index 0c0a7eb42fe..11cab5e8254 100644 --- a/TAO/tests/ORT/ORT_test_i.cpp +++ b/TAO/tests/ORT/ORT_test_i.cpp @@ -14,5 +14,5 @@ ORT_test_i::request_server (void) void ORT_test_i::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Objref_Sequence_Test/server.cpp b/TAO/tests/Objref_Sequence_Test/server.cpp index 0104a9bf3b8..9dc656d6d0b 100644 --- a/TAO/tests/Objref_Sequence_Test/server.cpp +++ b/TAO/tests/Objref_Sequence_Test/server.cpp @@ -104,7 +104,7 @@ ServerServant::DeleteExtra (const ServerSequence &seq) void ServerServant::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } /******************************************************/ diff --git a/TAO/tests/Ondemand_Write/Hello.cpp b/TAO/tests/Ondemand_Write/Hello.cpp index 30a7174af86..5509c723b4c 100644 --- a/TAO/tests/Ondemand_Write/Hello.cpp +++ b/TAO/tests/Ondemand_Write/Hello.cpp @@ -18,5 +18,5 @@ Hello::get_string ( void Hello::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Oneway_Buffering/Oneway_Buffering.cpp b/TAO/tests/Oneway_Buffering/Oneway_Buffering.cpp index 07df4ffea40..787b2ab6caa 100644 --- a/TAO/tests/Oneway_Buffering/Oneway_Buffering.cpp +++ b/TAO/tests/Oneway_Buffering/Oneway_Buffering.cpp @@ -27,5 +27,5 @@ Oneway_Buffering::sync (void) void Oneway_Buffering::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.cpp b/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.cpp index 38e92acfb0d..30685f48631 100644 --- a/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.cpp +++ b/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.cpp @@ -52,5 +52,5 @@ Oneway_Buffering_Admin::flush (void) void Oneway_Buffering_Admin::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Oneway_Send_Timeouts/Client.cpp b/TAO/tests/Oneway_Send_Timeouts/Client.cpp index cfb0e0875cf..5bcafb48a2a 100644 --- a/TAO/tests/Oneway_Send_Timeouts/Client.cpp +++ b/TAO/tests/Oneway_Send_Timeouts/Client.cpp @@ -21,7 +21,7 @@ Client::Client (int argc, ACE_TCHAR* argv[]) Client::~Client () { if (!CORBA::is_nil (orb_.in())) { - orb_->shutdown (1); + orb_->shutdown (true); orb_->destroy (); orb_ = CORBA::ORB::_nil(); } diff --git a/TAO/tests/Oneway_Send_Timeouts/Server.cpp b/TAO/tests/Oneway_Send_Timeouts/Server.cpp index be87b9e6ba4..ca501d47a9e 100644 --- a/TAO/tests/Oneway_Send_Timeouts/Server.cpp +++ b/TAO/tests/Oneway_Send_Timeouts/Server.cpp @@ -184,7 +184,7 @@ Server::shutdown () try { if (!CORBA::is_nil (management_orb_.in())) { - management_orb_->shutdown (1); + management_orb_->shutdown (true); ACE_OS::sleep (1); // Let management thread clear out } ACE_auto_ptr_reset (test_i_, (Test_i*)0); diff --git a/TAO/tests/Oneway_Send_Timeouts/Test_i.cpp b/TAO/tests/Oneway_Send_Timeouts/Test_i.cpp index a8cccb33fb9..21aa3e07330 100644 --- a/TAO/tests/Oneway_Send_Timeouts/Test_i.cpp +++ b/TAO/tests/Oneway_Send_Timeouts/Test_i.cpp @@ -79,7 +79,7 @@ Test_i::dummy_two_way () void Test_i::shutdown () { - orb_->shutdown (0); + orb_->shutdown (false); shutdown_ = true; ACE_DEBUG ((LM_DEBUG, "(%P|%t) Test_i::shutdown>\n")); } diff --git a/TAO/tests/Oneway_Timeouts/client.cpp b/TAO/tests/Oneway_Timeouts/client.cpp index 0dc112bb20b..a834bb31de2 100644 --- a/TAO/tests/Oneway_Timeouts/client.cpp +++ b/TAO/tests/Oneway_Timeouts/client.cpp @@ -494,7 +494,7 @@ int ACE_TMAIN (int ac, ACE_TCHAR *av[]) tmp_tester->test2 (-1); } - orb->shutdown (1); + orb->shutdown (true); orb->destroy (); diff --git a/TAO/tests/Oneway_Timeouts/server.cpp b/TAO/tests/Oneway_Timeouts/server.cpp index 19b7f52659f..9c41900337a 100644 --- a/TAO/tests/Oneway_Timeouts/server.cpp +++ b/TAO/tests/Oneway_Timeouts/server.cpp @@ -127,7 +127,7 @@ public: int handle_timeout (const ACE_Time_Value &, const void *) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); return 0; } diff --git a/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.cpp b/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.cpp index 78148ce9169..fff3f2968f8 100644 --- a/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.cpp +++ b/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.cpp @@ -36,5 +36,5 @@ Receiver_i::shutdown (void) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) About to invoke shutdown...\n")); - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Oneways_Invoking_Twoways/Sender_i.cpp b/TAO/tests/Oneways_Invoking_Twoways/Sender_i.cpp index 6708456bf72..3322734f790 100644 --- a/TAO/tests/Oneways_Invoking_Twoways/Sender_i.cpp +++ b/TAO/tests/Oneways_Invoking_Twoways/Sender_i.cpp @@ -49,5 +49,5 @@ Sender_i::shutdown (void) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) About to invoke shutdown...\n")); - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/POA/Bug_1592_Regression/test_i.cpp b/TAO/tests/POA/Bug_1592_Regression/test_i.cpp index e5bba01dc1f..c5df0e47b0c 100644 --- a/TAO/tests/POA/Bug_1592_Regression/test_i.cpp +++ b/TAO/tests/POA/Bug_1592_Regression/test_i.cpp @@ -30,5 +30,5 @@ test_i::op (void) void test_i::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/POA/Default_Servant2/File_i.cpp b/TAO/tests/POA/Default_Servant2/File_i.cpp index 54c374ca0df..141af0dbd9e 100644 --- a/TAO/tests/POA/Default_Servant2/File_i.cpp +++ b/TAO/tests/POA/Default_Servant2/File_i.cpp @@ -81,7 +81,7 @@ FileImpl::System::open (const char *file_name, void FileImpl::System::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } // IDL File::Descriptor constructor diff --git a/TAO/tests/POA/EndpointPolicy/Hello.cpp b/TAO/tests/POA/EndpointPolicy/Hello.cpp index 733fe2bfcaf..0d000b9f195 100644 --- a/TAO/tests/POA/EndpointPolicy/Hello.cpp +++ b/TAO/tests/POA/EndpointPolicy/Hello.cpp @@ -14,5 +14,5 @@ Hello::get_string (void) void Hello::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/POA/Forwarding/Servant_Activator.cpp b/TAO/tests/POA/Forwarding/Servant_Activator.cpp index 437245c15d8..51be53d4109 100644 --- a/TAO/tests/POA/Forwarding/Servant_Activator.cpp +++ b/TAO/tests/POA/Forwarding/Servant_Activator.cpp @@ -12,7 +12,7 @@ PortableServer::Servant ServantActivator::incarnate (const PortableServer::ObjectId &, PortableServer::POA_ptr) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); // Throw forward exception throw PortableServer::ForwardRequest (this->forward_to_.in ()); diff --git a/TAO/tests/POA/Forwarding/test_i.cpp b/TAO/tests/POA/Forwarding/test_i.cpp index 4381f124cc1..23134929959 100644 --- a/TAO/tests/POA/Forwarding/test_i.cpp +++ b/TAO/tests/POA/Forwarding/test_i.cpp @@ -34,7 +34,7 @@ test_i::forward (void) void test_i::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } PortableServer::POA_ptr diff --git a/TAO/tests/POA/Generic_Servant/test_i.cpp b/TAO/tests/POA/Generic_Servant/test_i.cpp index e8c87b99e13..01a1c126ffa 100644 --- a/TAO/tests/POA/Generic_Servant/test_i.cpp +++ b/TAO/tests/POA/Generic_Servant/test_i.cpp @@ -59,7 +59,7 @@ test_i::timed_oneway_method (CORBA::ULong timeout) void test_i::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/POA/Identity/Identity.cpp b/TAO/tests/POA/Identity/Identity.cpp index 349810d7917..63e6e97bcdc 100644 --- a/TAO/tests/POA/Identity/Identity.cpp +++ b/TAO/tests/POA/Identity/Identity.cpp @@ -546,7 +546,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) forth_poa.in (), perform_deactivation_test); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); 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 52ca11fa5b9..01f8679bc66 100644 --- a/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp +++ b/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp @@ -300,7 +300,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) first_task.wait (); second_task.wait (); - root_poa->destroy (1, 1); + root_poa->destroy (true, true); 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 5dc52e199fa..a3eefb3750b 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,7 +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 (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 979a9efe3aa..095603ccc8a 100644 --- a/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp +++ b/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp @@ -271,7 +271,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (result != 0) return result; - root_poa->destroy (1, 1); + root_poa->destroy (true, true); orb->destroy (); } diff --git a/TAO/tests/POA/Persistent_ID/server.cpp b/TAO/tests/POA/Persistent_ID/server.cpp index 967d4186a73..12c2ccf5dbe 100644 --- a/TAO/tests/POA/Persistent_ID/server.cpp +++ b/TAO/tests/POA/Persistent_ID/server.cpp @@ -72,7 +72,7 @@ test_i::method (void) void test_i::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } PortableServer::POA_ptr diff --git a/TAO/tests/POA/Reference_Counting/test.cpp b/TAO/tests/POA/Reference_Counting/test.cpp index 976250bf66b..4cd38026221 100644 --- a/TAO/tests/POA/Reference_Counting/test.cpp +++ b/TAO/tests/POA/Reference_Counting/test.cpp @@ -111,7 +111,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) h->_remove_ref (); - orb->shutdown (1); + orb->shutdown (true); orb->destroy (); } diff --git a/TAO/tests/Parallel_Connect_Strategy/Test_i.cpp b/TAO/tests/Parallel_Connect_Strategy/Test_i.cpp index ad0080d389b..17607898770 100644 --- a/TAO/tests/Parallel_Connect_Strategy/Test_i.cpp +++ b/TAO/tests/Parallel_Connect_Strategy/Test_i.cpp @@ -14,5 +14,5 @@ Hello::get_string (void) void Hello::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Portable_Interceptors/AdvSlot/server.cpp b/TAO/tests/Portable_Interceptors/AdvSlot/server.cpp index a1049b1dced..acbc5333dc2 100644 --- a/TAO/tests/Portable_Interceptors/AdvSlot/server.cpp +++ b/TAO/tests/Portable_Interceptors/AdvSlot/server.cpp @@ -79,7 +79,7 @@ public: shutdown () { ACE_DEBUG ((LM_DEBUG, "Server is shutting down.\n")); - this->orb_->shutdown (0); + this->orb_->shutdown (false); } //FUZZ: enable check_for_lack_ACE_OS diff --git a/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/server.cpp b/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/server.cpp index 796b68816db..5bbf5592e50 100644 --- a/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/server.cpp +++ b/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/server.cpp @@ -192,7 +192,7 @@ public: shutdown () { ACE_DEBUG ((LM_DEBUG, "\nServer is shutting down.\n")); - this->orb_->shutdown (0); + this->orb_->shutdown (false); } //FUZZ: enable check_for_lack_ACE_OS diff --git a/TAO/tests/Portable_Interceptors/AdvSlotExt/server.cpp b/TAO/tests/Portable_Interceptors/AdvSlotExt/server.cpp index 8661f2c128b..11180393b56 100644 --- a/TAO/tests/Portable_Interceptors/AdvSlotExt/server.cpp +++ b/TAO/tests/Portable_Interceptors/AdvSlotExt/server.cpp @@ -78,7 +78,7 @@ public: shutdown () { ACE_DEBUG ((LM_DEBUG, "Server is shutting down.\n")); - this->orb_->shutdown (0); + this->orb_->shutdown (false); } //FUZZ: enable check_for_lack_ACE_OS diff --git a/TAO/tests/Portable_Interceptors/Benchmark/test_i.cpp b/TAO/tests/Portable_Interceptors/Benchmark/test_i.cpp index f11b29b637b..3494d7b5565 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/Benchmark/test_i.cpp @@ -32,5 +32,5 @@ return 1; void Secure_Vault_i::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/test_i.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/test_i.cpp index 96622f81dc5..268a43a0843 100644 --- a/TAO/tests/Portable_Interceptors/Bug_1559/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_1559/test_i.cpp @@ -34,5 +34,5 @@ Visual_i::system (void) void Visual_i::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Portable_Interceptors/Bug_2133/server.cpp b/TAO/tests/Portable_Interceptors/Bug_2133/server.cpp index 4dfc1df9d87..951ccc19cb7 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 (true, true); orb->destroy (); diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.cpp index 2d056041912..8c8edb1a9b0 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.cpp @@ -51,5 +51,5 @@ Visual_i::normal (CORBA::Long arg) void Visual_i::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Portable_Interceptors/Bug_3079/test_i.cpp b/TAO/tests/Portable_Interceptors/Bug_3079/test_i.cpp index 07ad3876c6b..74f41eb6ccf 100644 --- a/TAO/tests/Portable_Interceptors/Bug_3079/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_3079/test_i.cpp @@ -24,5 +24,5 @@ test_i::shutdown (void) ACE_DEBUG ((LM_DEBUG, "Server is shutting down via object %d.\n", this->number_)); - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Portable_Interceptors/Bug_3080/server.cpp b/TAO/tests/Portable_Interceptors/Bug_3080/server.cpp index 19dcece99c8..9739d7430de 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 (true, true); orb->destroy (); diff --git a/TAO/tests/Portable_Interceptors/Bug_3080/test_i.cpp b/TAO/tests/Portable_Interceptors/Bug_3080/test_i.cpp index 07ad3876c6b..74f41eb6ccf 100644 --- a/TAO/tests/Portable_Interceptors/Bug_3080/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_3080/test_i.cpp @@ -24,5 +24,5 @@ test_i::shutdown (void) ACE_DEBUG ((LM_DEBUG, "Server is shutting down via object %d.\n", this->number_)); - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Portable_Interceptors/Bug_3582/test_i.cpp b/TAO/tests/Portable_Interceptors/Bug_3582/test_i.cpp index 07ad3876c6b..74f41eb6ccf 100644 --- a/TAO/tests/Portable_Interceptors/Bug_3582/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_3582/test_i.cpp @@ -24,5 +24,5 @@ test_i::shutdown (void) ACE_DEBUG ((LM_DEBUG, "Server is shutting down via object %d.\n", this->number_)); - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.cpp b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.cpp index 32bcca905a4..651aa681fc6 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.cpp @@ -36,5 +36,5 @@ Visual_i::shutdown (void) { // this->_remove_ref (); ACE_DEBUG ((LM_DEBUG,"(%P|%t) visual_i::shutdown\n")); - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.cpp index 07ad3876c6b..74f41eb6ccf 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.cpp @@ -24,5 +24,5 @@ test_i::shutdown (void) ACE_DEBUG ((LM_DEBUG, "Server is shutting down via object %d.\n", this->number_)); - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.cpp index 8444e9c7d44..b5d29c3c716 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.cpp @@ -11,5 +11,5 @@ test_i::shutdown (void) { ACE_DEBUG ((LM_DEBUG, "\"test_i\" is shutting down.\n")); - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/test_i.cpp b/TAO/tests/Portable_Interceptors/ORB_Shutdown/test_i.cpp index 3fc798684a3..b49ee6ca120 100644 --- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/test_i.cpp @@ -21,5 +21,5 @@ test_i::shutdown (void) ACE_DEBUG ((LM_DEBUG, "Shutting down ORB.\n")); - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Portable_Interceptors/PICurrent/test_i.cpp b/TAO/tests/Portable_Interceptors/PICurrent/test_i.cpp index 7f6dd624104..d8deb2c5e89 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/PICurrent/test_i.cpp @@ -165,5 +165,5 @@ test_i::shutdown (void) ACE_DEBUG ((LM_DEBUG, "(%P|%t) Server is shutting down.\n")); - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Portable_Interceptors/Redirection/test_i.cpp b/TAO/tests/Portable_Interceptors/Redirection/test_i.cpp index 07ad3876c6b..74f41eb6ccf 100644 --- a/TAO/tests/Portable_Interceptors/Redirection/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/Redirection/test_i.cpp @@ -24,5 +24,5 @@ test_i::shutdown (void) ACE_DEBUG ((LM_DEBUG, "Server is shutting down via object %d.\n", this->number_)); - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.cpp index a99ca98158b..9f87a70c3f5 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.cpp @@ -51,5 +51,5 @@ test_i::shutdown (void) ACE_DEBUG ((LM_INFO, "Server is shutting down.\n")); - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.cpp index 96622f81dc5..268a43a0843 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.cpp @@ -34,5 +34,5 @@ Visual_i::system (void) void Visual_i::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/QtTests/test_i.cpp b/TAO/tests/QtTests/test_i.cpp index 3b019c1e6da..c0074bd073f 100644 --- a/TAO/tests/QtTests/test_i.cpp +++ b/TAO/tests/QtTests/test_i.cpp @@ -11,7 +11,7 @@ LCD_Display_imp::shutdown (void) { ACE_DEBUG ((LM_DEBUG, "The ORB has been shutdown, Close the windows to exit\n")); - this->orb_->shutdown (0); + this->orb_->shutdown (false); this->orb_->destroy (); } diff --git a/TAO/tests/RTCORBA/Banded_Connections/server.cpp b/TAO/tests/RTCORBA/Banded_Connections/server.cpp index d59cac80edf..9681db29429 100644 --- a/TAO/tests/RTCORBA/Banded_Connections/server.cpp +++ b/TAO/tests/RTCORBA/Banded_Connections/server.cpp @@ -106,7 +106,7 @@ Test_i::test_method (CORBA::Boolean client_propagated, void Test_i::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } //************************************************************************* diff --git a/TAO/tests/RTCORBA/Bug_3382_Regression/server.cpp b/TAO/tests/RTCORBA/Bug_3382_Regression/server.cpp index 253f91cd2f6..5429782ab61 100644 --- a/TAO/tests/RTCORBA/Bug_3382_Regression/server.cpp +++ b/TAO/tests/RTCORBA/Bug_3382_Regression/server.cpp @@ -63,7 +63,7 @@ Test_i::test_method (CORBA::Short priority) void Test_i::shutdown () { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } //************************************************************************* diff --git a/TAO/tests/RTCORBA/Bug_3643_Regression/test_i.cpp b/TAO/tests/RTCORBA/Bug_3643_Regression/test_i.cpp index f619d77831a..4f22163fed7 100644 --- a/TAO/tests/RTCORBA/Bug_3643_Regression/test_i.cpp +++ b/TAO/tests/RTCORBA/Bug_3643_Regression/test_i.cpp @@ -58,5 +58,5 @@ test_i::_default_POA (void) void test_i::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/RTCORBA/Client_Propagated/server.cpp b/TAO/tests/RTCORBA/Client_Propagated/server.cpp index 2d7e68a5d92..bbb4f8a5a7d 100644 --- a/TAO/tests/RTCORBA/Client_Propagated/server.cpp +++ b/TAO/tests/RTCORBA/Client_Propagated/server.cpp @@ -65,7 +65,7 @@ Test_i::test_method (CORBA::Short priority) void Test_i::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } //************************************************************************* diff --git a/TAO/tests/RTCORBA/Client_Protocol/server.cpp b/TAO/tests/RTCORBA/Client_Protocol/server.cpp index 1046f789a89..3e12434cb55 100644 --- a/TAO/tests/RTCORBA/Client_Protocol/server.cpp +++ b/TAO/tests/RTCORBA/Client_Protocol/server.cpp @@ -42,7 +42,7 @@ Test_i::shutdown (void) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Shutting down\n")); - this->orb_->shutdown (0); + this->orb_->shutdown (false); } //************************************************************************* diff --git a/TAO/tests/RTCORBA/Collocation/Collocation.cpp b/TAO/tests/RTCORBA/Collocation/Collocation.cpp index d1772091436..e164eda6df7 100644 --- a/TAO/tests/RTCORBA/Collocation/Collocation.cpp +++ b/TAO/tests/RTCORBA/Collocation/Collocation.cpp @@ -742,7 +742,7 @@ Server::test (void) void Server::shutdown (void) { - this->orb_->shutdown (1); + this->orb_->shutdown (true); this->orb_->destroy (); } diff --git a/TAO/tests/RTCORBA/Diffserv/server.cpp b/TAO/tests/RTCORBA/Diffserv/server.cpp index 48f9dd6b394..1658d903351 100644 --- a/TAO/tests/RTCORBA/Diffserv/server.cpp +++ b/TAO/tests/RTCORBA/Diffserv/server.cpp @@ -38,7 +38,7 @@ Test_i::test_method (void) void Test_i::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } static const ACE_TCHAR *simple_servant_ior_file = ACE_TEXT("simple_servant.ior"); diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.cpp b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.cpp index f619d77831a..4f22163fed7 100644 --- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.cpp +++ b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.cpp @@ -58,5 +58,5 @@ test_i::_default_POA (void) void test_i::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/RTCORBA/Explicit_Binding/server.cpp b/TAO/tests/RTCORBA/Explicit_Binding/server.cpp index a9026c64252..9dfa5127741 100644 --- a/TAO/tests/RTCORBA/Explicit_Binding/server.cpp +++ b/TAO/tests/RTCORBA/Explicit_Binding/server.cpp @@ -41,7 +41,7 @@ Test_i::test_method (/* */) void Test_i::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } //************************************************************************* diff --git a/TAO/tests/RTCORBA/Linear_Priority/server.cpp b/TAO/tests/RTCORBA/Linear_Priority/server.cpp index de5e91f02cb..5a6a921115a 100644 --- a/TAO/tests/RTCORBA/Linear_Priority/server.cpp +++ b/TAO/tests/RTCORBA/Linear_Priority/server.cpp @@ -47,7 +47,7 @@ test_i::shutdown (void) ACE_DEBUG ((LM_DEBUG, "test_i::shutdown\n")); - this->orb_->shutdown (0); + this->orb_->shutdown (false); } PortableServer::POA_ptr diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp index dd493dd7b41..9eb297af4a4 100644 --- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp +++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp @@ -41,7 +41,7 @@ Test_i::test_method ( /* */) void Test_i::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } //************************************************************************* diff --git a/TAO/tests/RTCORBA/Persistent_IOR/server.cpp b/TAO/tests/RTCORBA/Persistent_IOR/server.cpp index 4f81db55c44..e3e9ce72fac 100644 --- a/TAO/tests/RTCORBA/Persistent_IOR/server.cpp +++ b/TAO/tests/RTCORBA/Persistent_IOR/server.cpp @@ -47,7 +47,7 @@ test_i::shutdown (void) ACE_DEBUG ((LM_DEBUG, "test_i::shutdown\n")); - this->orb_->shutdown (0); + this->orb_->shutdown (false); } PortableServer::POA_ptr diff --git a/TAO/tests/RTCORBA/Policy_Combinations/server.cpp b/TAO/tests/RTCORBA/Policy_Combinations/server.cpp index c6fde5e5d02..58ba9bb2226 100644 --- a/TAO/tests/RTCORBA/Policy_Combinations/server.cpp +++ b/TAO/tests/RTCORBA/Policy_Combinations/server.cpp @@ -79,7 +79,7 @@ test_i::shutdown (void) ACE_DEBUG ((LM_DEBUG, "test_i::shutdown\n")); - this->orb_->shutdown (0); + this->orb_->shutdown (false); } PortableServer::POA_ptr diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.cpp b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.cpp index cadb2149ffa..8b0cf47ea8b 100644 --- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.cpp +++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.cpp @@ -85,7 +85,7 @@ test_i::method (CORBA::ULong work, if (this->current_iteration_ == this->total_iterations_) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } } diff --git a/TAO/tests/RTCORBA/Private_Connection/server.cpp b/TAO/tests/RTCORBA/Private_Connection/server.cpp index 5f1894cc998..7d33d8e2a48 100644 --- a/TAO/tests/RTCORBA/Private_Connection/server.cpp +++ b/TAO/tests/RTCORBA/Private_Connection/server.cpp @@ -40,7 +40,7 @@ Test_i::test_method (/* */) void Test_i::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } //************************************************************************* diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp index 4a154cd0e18..644a7c9ea5b 100644 --- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp +++ b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp @@ -80,7 +80,7 @@ test_i::shutdown (void) ACE_DEBUG ((LM_DEBUG, "test_i::shutdown\n")); - this->orb_->shutdown (0); + this->orb_->shutdown (false); } PortableServer::POA_ptr diff --git a/TAO/tests/RTCORBA/Server_Declared/server.cpp b/TAO/tests/RTCORBA/Server_Declared/server.cpp index b35389e6690..78bade30931 100644 --- a/TAO/tests/RTCORBA/Server_Declared/server.cpp +++ b/TAO/tests/RTCORBA/Server_Declared/server.cpp @@ -64,7 +64,7 @@ Test_i::test_method (CORBA::Short priority) void Test_i::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } //************************************************************************* diff --git a/TAO/tests/RTCORBA/Server_Protocol/server.cpp b/TAO/tests/RTCORBA/Server_Protocol/server.cpp index 620c748d934..dbfe11fae93 100644 --- a/TAO/tests/RTCORBA/Server_Protocol/server.cpp +++ b/TAO/tests/RTCORBA/Server_Protocol/server.cpp @@ -35,7 +35,7 @@ Test_i::shutdown (void) { ACE_DEBUG ((LM_DEBUG, "Received request to shut down the ORB\n")); - this->orb_->shutdown (0); + this->orb_->shutdown (false); } //************************************************************************* diff --git a/TAO/tests/RTCORBA/Thread_Pool/test_i.cpp b/TAO/tests/RTCORBA/Thread_Pool/test_i.cpp index b0ccaf4b360..f05b9b314f5 100644 --- a/TAO/tests/RTCORBA/Thread_Pool/test_i.cpp +++ b/TAO/tests/RTCORBA/Thread_Pool/test_i.cpp @@ -52,5 +52,5 @@ test_i::_default_POA (void) void test_i::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/RTScheduling/Current/Thread_Task.cpp b/TAO/tests/RTScheduling/Current/Thread_Task.cpp index 1aee52a1f54..5184795bebd 100644 --- a/TAO/tests/RTScheduling/Current/Thread_Task.cpp +++ b/TAO/tests/RTScheduling/Current/Thread_Task.cpp @@ -156,7 +156,7 @@ Thread_Task::svc (void) // exceptions on fast dual processor machines. ACE_OS::sleep (1); - orb_->shutdown (0); + orb_->shutdown (false); } } } diff --git a/TAO/tests/Reliable_Oneways/Shutdown_Helper.cpp b/TAO/tests/Reliable_Oneways/Shutdown_Helper.cpp index 61cff1817cd..ca529160340 100644 --- a/TAO/tests/Reliable_Oneways/Shutdown_Helper.cpp +++ b/TAO/tests/Reliable_Oneways/Shutdown_Helper.cpp @@ -8,5 +8,5 @@ Shutdown_Helper::Shutdown_Helper (CORBA::ORB_ptr orb) void Shutdown_Helper::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/SHMIOP/shmiop_test.cpp b/TAO/tests/SHMIOP/shmiop_test.cpp index dfbd3699508..ff0942d6a0e 100644 --- a/TAO/tests/SHMIOP/shmiop_test.cpp +++ b/TAO/tests/SHMIOP/shmiop_test.cpp @@ -21,7 +21,7 @@ struct Servant : virtual POA_Test::Hello void shutdown () { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } CORBA::ORB_var orb_; diff --git a/TAO/tests/Server_Connection_Purging/Test_i.cpp b/TAO/tests/Server_Connection_Purging/Test_i.cpp index b47d464f483..32bcd87338f 100644 --- a/TAO/tests/Server_Connection_Purging/Test_i.cpp +++ b/TAO/tests/Server_Connection_Purging/Test_i.cpp @@ -16,5 +16,5 @@ test_i::shutdown (void) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) About to invoke shudown...\n")); - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Server_Leaks/Ping_Service.cpp b/TAO/tests/Server_Leaks/Ping_Service.cpp index b1e5ebaa08b..3ad4f33e1f8 100644 --- a/TAO/tests/Server_Leaks/Ping_Service.cpp +++ b/TAO/tests/Server_Leaks/Ping_Service.cpp @@ -13,5 +13,5 @@ Ping_Service::ping (void) void Ping_Service::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Server_Port_Zero/Hello.cpp b/TAO/tests/Server_Port_Zero/Hello.cpp index 733fe2bfcaf..0d000b9f195 100644 --- a/TAO/tests/Server_Port_Zero/Hello.cpp +++ b/TAO/tests/Server_Port_Zero/Hello.cpp @@ -14,5 +14,5 @@ Hello::get_string (void) void Hello::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Single_Read/server.cpp b/TAO/tests/Single_Read/server.cpp index ca31d953f93..13aead3541c 100644 --- a/TAO/tests/Single_Read/server.cpp +++ b/TAO/tests/Single_Read/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); } catch (const CORBA::Exception& ex) { diff --git a/TAO/tests/Single_Read/test_i.cpp b/TAO/tests/Single_Read/test_i.cpp index fd901f80264..44acb005512 100644 --- a/TAO/tests/Single_Read/test_i.cpp +++ b/TAO/tests/Single_Read/test_i.cpp @@ -43,5 +43,5 @@ test_i::shutdown (void) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) About to invoke shudown... ")); - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Smart_Proxies/Benchmark/server.cpp b/TAO/tests/Smart_Proxies/Benchmark/server.cpp index 9fde495323c..c6c407c2e99 100644 --- a/TAO/tests/Smart_Proxies/Benchmark/server.cpp +++ b/TAO/tests/Smart_Proxies/Benchmark/server.cpp @@ -54,7 +54,7 @@ Test_i::tickets (CORBA::Short number) void Test_i::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } static const ACE_TCHAR *ior_output_file = 0; diff --git a/TAO/tests/Smart_Proxies/Policy/server.cpp b/TAO/tests/Smart_Proxies/Policy/server.cpp index d08190d4332..4e1e4c1fa73 100644 --- a/TAO/tests/Smart_Proxies/Policy/server.cpp +++ b/TAO/tests/Smart_Proxies/Policy/server.cpp @@ -51,7 +51,7 @@ Test_i :: method (CORBA::Short boo) void Test_i::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } static const ACE_TCHAR *ior_output_file = 0; diff --git a/TAO/tests/Smart_Proxies/dtor/server.cpp b/TAO/tests/Smart_Proxies/dtor/server.cpp index 0670c1d43c9..1ccc4ed8a80 100644 --- a/TAO/tests/Smart_Proxies/dtor/server.cpp +++ b/TAO/tests/Smart_Proxies/dtor/server.cpp @@ -31,7 +31,7 @@ Test_i::hello (CORBA::Long howmany) void Test_i::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } static const ACE_TCHAR *ior_output_file = 0; @@ -116,7 +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 (true, true); orb->destroy (); } diff --git a/TAO/tests/Smart_Proxies/server.cpp b/TAO/tests/Smart_Proxies/server.cpp index a001cfde7a6..00b5e43f2c9 100644 --- a/TAO/tests/Smart_Proxies/server.cpp +++ b/TAO/tests/Smart_Proxies/server.cpp @@ -51,7 +51,7 @@ Test_i :: method (CORBA::Short boo) void Test_i::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } static const ACE_TCHAR *ior_output_file = 0; @@ -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); orb->destroy (); } diff --git a/TAO/tests/Stack_Recursion/server.cpp b/TAO/tests/Stack_Recursion/server.cpp index 0cd3c047958..0d0ef66c2c3 100644 --- a/TAO/tests/Stack_Recursion/server.cpp +++ b/TAO/tests/Stack_Recursion/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/Strategies/simple_test_i.cpp b/TAO/tests/Strategies/simple_test_i.cpp index f4292f5454b..6e6012b4613 100644 --- a/TAO/tests/Strategies/simple_test_i.cpp +++ b/TAO/tests/Strategies/simple_test_i.cpp @@ -17,5 +17,5 @@ Simple_Server_i::print_status (void) void Simple_Server_i::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Timed_Buffered_Oneways/client.cpp b/TAO/tests/Timed_Buffered_Oneways/client.cpp index 290770e341a..0b93b2eece0 100644 --- a/TAO/tests/Timed_Buffered_Oneways/client.cpp +++ b/TAO/tests/Timed_Buffered_Oneways/client.cpp @@ -240,7 +240,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) test_object_no_policy->shutdown (now); } - orb->shutdown (1); + orb->shutdown (true); // 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/tests/Timed_Buffered_Oneways/test_i.cpp b/TAO/tests/Timed_Buffered_Oneways/test_i.cpp index 59e6db0265c..969d9534bc5 100644 --- a/TAO/tests/Timed_Buffered_Oneways/test_i.cpp +++ b/TAO/tests/Timed_Buffered_Oneways/test_i.cpp @@ -42,5 +42,5 @@ test_i::shutdown (CORBA::Long start_time) start.msec (static_cast<long> (start_time)); // HPUX seems to require this cast ACE_DEBUG ((LM_DEBUG, "server: Shutting down... (%dms)\n", (ACE_OS::gettimeofday() - start).msec ())); - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Timeout/test_i.cpp b/TAO/tests/Timeout/test_i.cpp index 829ad2298e3..d615af9689d 100644 --- a/TAO/tests/Timeout/test_i.cpp +++ b/TAO/tests/Timeout/test_i.cpp @@ -37,5 +37,5 @@ Simple_Server_i::shutdown (void) { ACE_DEBUG ((LM_DEBUG, "server (%P) Received shutdown request from client\n")); - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/TransportCurrent/Framework/Current_Test_Impl.cpp b/TAO/tests/TransportCurrent/Framework/Current_Test_Impl.cpp index 8674b995e7a..d800764960b 100644 --- a/TAO/tests/TransportCurrent/Framework/Current_Test_Impl.cpp +++ b/TAO/tests/TransportCurrent/Framework/Current_Test_Impl.cpp @@ -138,5 +138,5 @@ Current_Test_Impl::shutdown (void) ACE_TEXT ("(%P|%t) server - shutting down.\n"))); } - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/TransportCurrent/IIOP/Current_Test_Impl.cpp b/TAO/tests/TransportCurrent/IIOP/Current_Test_Impl.cpp index 9d3e9ab646e..08bcc61a7ed 100644 --- a/TAO/tests/TransportCurrent/IIOP/Current_Test_Impl.cpp +++ b/TAO/tests/TransportCurrent/IIOP/Current_Test_Impl.cpp @@ -113,5 +113,5 @@ Current_Test_Impl::shutdown (void) ACE_TEXT ("(%P|%t) server - shutting down.\n"))); } - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/Two_Objects/Second_i.cpp b/TAO/tests/Two_Objects/Second_i.cpp index 7fe7a2364e5..324a470f8f5 100644 --- a/TAO/tests/Two_Objects/Second_i.cpp +++ b/TAO/tests/Two_Objects/Second_i.cpp @@ -49,5 +49,5 @@ void Second_i::shutdown (void) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) about to shutdown the orb\n")); - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/UNKNOWN_Exception/server.cpp b/TAO/tests/UNKNOWN_Exception/server.cpp index 6e6a3f0066a..1245a1f3650 100644 --- a/TAO/tests/UNKNOWN_Exception/server.cpp +++ b/TAO/tests/UNKNOWN_Exception/server.cpp @@ -153,7 +153,7 @@ test_factory_i::shutdown (void) "factory_i::shutdown() called\n")); done = 1; - this->orb_->shutdown (0); + this->orb_->shutdown (false); } int diff --git a/TAO/tests/Xt_Stopwatch/test_i.cpp b/TAO/tests/Xt_Stopwatch/test_i.cpp index 4f617855354..5f7a480883e 100644 --- a/TAO/tests/Xt_Stopwatch/test_i.cpp +++ b/TAO/tests/Xt_Stopwatch/test_i.cpp @@ -21,6 +21,6 @@ Stopwatch_imp::stop (void) void Stopwatch_imp::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } diff --git a/TAO/tests/ZIOP/Hello.cpp b/TAO/tests/ZIOP/Hello.cpp index d9d84dede11..27e011bc7dd 100644 --- a/TAO/tests/ZIOP/Hello.cpp +++ b/TAO/tests/ZIOP/Hello.cpp @@ -46,5 +46,5 @@ Hello::big_request (const ::Test::Octet_Seq & octet_in) void Hello::shutdown (void) { - this->orb_->shutdown (0); + this->orb_->shutdown (false); } |