bool changes

74 files changed, 83 insertions, 100 deletions

diff --git a/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/MessengerServer.cpp
index 9a8642a0587..4358936462e 100644
--- a/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/MessengerServer.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/MessengerServer.cpp
@@ -78,7 +78,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     std::cout << "IOR written to file " << ACE_TEXT_ALWAYS_CHAR(ior_output_file) << std::endl;
 
     orb->run();
-    poa->destroy (1, 1);
+    poa->destroy (true, true);
     orb->destroy ();
 
     std::cout << "Messenger Server is shut down!"
diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/server.cpp b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/server.cpp
index 5e131ebbd65..f96b1eda01e 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/server.cpp
+++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/server.cpp
@@ -107,7 +107,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       // Run the ORB event loop.
       orb->run ();
 
-      root_poa->destroy (1, 1);
+      root_poa->destroy (true, true);
 
       orb->destroy ();
 
diff --git a/TAO/orbsvcs/examples/LoadBalancing/server.cpp b/TAO/orbsvcs/examples/LoadBalancing/server.cpp
index 49c00ddf9f2..c3f0c42fcd8 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/server.cpp
+++ b/TAO/orbsvcs/examples/LoadBalancing/server.cpp
@@ -299,7 +299,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1);
+      root_poa->destroy (true, true);
 
       orb->destroy ();
     }
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp b/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp
index 3028d6a29d8..cb9cfc040ca 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp
+++ b/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp
@@ -290,7 +290,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       // Now we can destroy the POA, the flags mean that we want to
       // wait until the POA is really destroyed
-      poa->destroy (1, 1);
+      poa->destroy (true, true);
 
       // Finally destroy the ORB
       orb->destroy ();
diff --git a/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp b/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp
index a644b0db7cb..07c950987ef 100644
--- a/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp
+++ b/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp
@@ -48,7 +48,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       // Start the ORB
       orb->run ();
 
-      root_poa->destroy (1, 1);
+      root_poa->destroy (true, true);
 
     }
   catch (const CORBA::SytemException& )
diff --git a/TAO/orbsvcs/examples/Security/Send_File/server.cpp b/TAO/orbsvcs/examples/Security/Send_File/server.cpp
index 0a1794867fe..9b9f82aab2c 100644
--- a/TAO/orbsvcs/examples/Security/Send_File/server.cpp
+++ b/TAO/orbsvcs/examples/Security/Send_File/server.cpp
@@ -86,7 +86,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
-      root_poa->destroy (1, 1);
+      root_poa->destroy (true, true);
 
       ACE_OS::sleep (5);
     }
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp
index 72507316dc3..d3e59a5cb51 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp
@@ -323,7 +323,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1);
+      root_poa->destroy (true, true);
 
       orb->destroy ();
     }
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp
index 55fe8e4641f..dd461f6fdae 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp
@@ -319,7 +319,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1);
+      root_poa->destroy (true, true);
 
       orb->destroy ();
     }
diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp
index 487bb92dab3..66094a47083 100644
--- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp
@@ -348,7 +348,7 @@ ACE_TMAIN (int argc,
         ACE_ERROR_RETURN ((LM_ERROR,"client::init failed\n"),1);
       result = CLIENT::instance ()->run ();
 
-      poa->destroy (1, 1);
+      poa->destroy (true, true);
 
       orb->destroy ();
 
diff --git a/TAO/orbsvcs/tests/Bug_1395_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_1395_Regression/server.cpp
index 5873276dd90..e5be4e90c2f 100644
--- a/TAO/orbsvcs/tests/Bug_1395_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_1395_Regression/server.cpp
@@ -117,7 +117,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       orb->run ();
 
-      root_poa->destroy (1, 1);
+      root_poa->destroy (true, true);
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/server.cpp
index 53cdb4e4ec8..f983ad306dd 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/server.cpp
@@ -191,7 +191,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1);
+      root_poa->destroy (true, true);
 
       orb->destroy ();
     }
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/server2.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/server2.cpp
index 2ff69131f4b..23ba5d49388 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/server2.cpp
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/server2.cpp
@@ -133,7 +133,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       orb->run ();
 
-      root_poa->destroy (1, 1);
+      root_poa->destroy (true, true);
 
       orb->destroy ();
     }
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2287_Regression/server.cpp
index 9b996a3abb6..74a4a85be49 100644
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_2287_Regression/server.cpp
@@ -195,7 +195,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1);
+      root_poa->destroy (true, true);
 
       orb->destroy ();
     }
diff --git a/TAO/orbsvcs/tests/Bug_2377_Regression/uipmc_test.cpp b/TAO/orbsvcs/tests/Bug_2377_Regression/uipmc_test.cpp
index b201c95b513..c76f9a61566 100644
--- a/TAO/orbsvcs/tests/Bug_2377_Regression/uipmc_test.cpp
+++ b/TAO/orbsvcs/tests/Bug_2377_Regression/uipmc_test.cpp
@@ -235,7 +235,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                            "\n (%P|%t) No single call got through to the server\n"),
                            3);
 
-      root_poa->destroy (1, 1);
+      root_poa->destroy (true, true);
 
       orb->destroy ();
     }
diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2615_Regression/server.cpp
index cf624587455..66fc310132d 100644
--- a/TAO/orbsvcs/tests/Bug_2615_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_2615_Regression/server.cpp
@@ -205,7 +205,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1);
+      root_poa->destroy (true, true);
 
       orb->destroy ();
     }
diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/Server_Task.cpp b/TAO/orbsvcs/tests/Bug_2709_Regression/Server_Task.cpp
index eaa5b66865a..f7904897fff 100644
--- a/TAO/orbsvcs/tests/Bug_2709_Regression/Server_Task.cpp
+++ b/TAO/orbsvcs/tests/Bug_2709_Regression/Server_Task.cpp
@@ -65,7 +65,7 @@ Server_Task::svc (void)
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
-      root_poa->destroy (1, 1);
+      root_poa->destroy (true, true);
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/orbsvcs/tests/Bug_2925_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2925_Regression/server.cpp
index 7c6ac21a3b1..385b4856c5d 100644
--- a/TAO/orbsvcs/tests/Bug_2925_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_2925_Regression/server.cpp
@@ -123,7 +123,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
       orb->run ();
 
-      root_poa->destroy (1, 1);
+      root_poa->destroy (true, true);
 
       orb->destroy ();
 
diff --git a/TAO/orbsvcs/tests/Bug_3215_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_3215_Regression/server.cpp
index 3c1da0dded8..70f288cd8fc 100644
--- a/TAO/orbsvcs/tests/Bug_3215_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_3215_Regression/server.cpp
@@ -215,14 +215,11 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
       poa_manager->activate ();
 
-
       orb->run ();
 
-
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 );
-
+      root_poa->destroy (1, 1);
 
       orb->destroy ();
     }
diff --git a/TAO/orbsvcs/tests/Bug_3216_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_3216_Regression/server.cpp
index 4600310435b..2cc6c56815f 100644
--- a/TAO/orbsvcs/tests/Bug_3216_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_3216_Regression/server.cpp
@@ -216,11 +216,9 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 );
-
+      root_poa->destroy (1, 1);
 
       orb->destroy ();
-
     }
   catch (const CORBA::Exception& ex)
     {
@@ -229,6 +227,5 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       return 1;
     }
 
-
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventConsumer_i.cpp b/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventConsumer_i.cpp
index 053fb8d0f34..478bc730b33 100644
--- a/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventConsumer_i.cpp
+++ b/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventConsumer_i.cpp
@@ -11,49 +11,43 @@ StructuredEventConsumer_i::StructuredEventConsumer_i(CORBA::ORB_ptr orb)
 
 void
 StructuredEventConsumer_i::push_structured_event(
-       const CosNotification::StructuredEvent &event
-      )
+       const CosNotification::StructuredEvent &event)
 {
-
   std::cout << "event received " << std::endl;
 
-  const char *value;
+  const char *value = 0;
 
   for (unsigned int i=0; i<event.filterable_data.length(); i++) {
     event.filterable_data[i].value >>= value;
     std::cout << event.filterable_data[i].name.in() << "\t" << value << std::endl;
   }
-  count_++;
-  if ( count_ >= 3 )
+  ++count_;
+  if (count_ >= 3)
   {
     consumerStop();
   }
-
 }
 
 void
 StructuredEventConsumer_i::disconnect_structured_push_consumer()
 {
-
    CORBA::Object_var obj = orb_->resolve_initial_references ("POACurrent");
    PortableServer::Current_var current =
                           PortableServer::Current::_narrow (obj.in());
    PortableServer::POA_var poa = current->get_POA ();
    PortableServer::ObjectId_var objectId = current->get_object_id ();
    poa->deactivate_object (objectId.in());
-
 }
 
 void
 StructuredEventConsumer_i::offer_change(
         const CosNotification::EventTypeSeq &,
-        const CosNotification::EventTypeSeq &
-      )
+        const CosNotification::EventTypeSeq &)
 {
 }
 
 int
 StructuredEventConsumer_i::nummsgs()
 {
-    return count_;
+  return count_;
 }
diff --git a/TAO/orbsvcs/tests/Bug_3598b_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_3598b_Regression/server.cpp
index 90979bacc9f..4dfc1df9d87 100644
--- a/TAO/orbsvcs/tests/Bug_3598b_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_3598b_Regression/server.cpp
@@ -77,7 +77,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      root_poa->destroy (1, 1 );
+      root_poa->destroy (1, 1);
 
       orb->destroy ();
 
diff --git a/TAO/orbsvcs/tests/Bug_3891_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_3891_Regression/server.cpp
index 87d6eb3cdae..d9997da7983 100644
--- a/TAO/orbsvcs/tests/Bug_3891_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_3891_Regression/server.cpp
@@ -60,7 +60,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
           ACE_ERROR_RETURN ((LM_ERROR, "ERROR: type_id is incorrect\n"), 1);
         }
 
-      root_poa->destroy (1, 1);
+      root_poa->destroy (true, true);
       orb->destroy ();
     }
   catch (const CORBA::Exception& ex)
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp
index 6ef684dc6cb..91776012695 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp
@@ -35,7 +35,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       // ****************************************************************
 
-      poa->destroy (1, 1);
+      poa->destroy (true, true);
 
       orb->destroy ();
 
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp
index bcb8dfb4c0a..d8d9bc52d97 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp
@@ -35,7 +35,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       // ****************************************************************
 
-      poa->destroy (1, 1);
+      poa->destroy (true, true);
 
       orb->destroy ();
 
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp
index 5310576888a..755e2fe0ab4 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp
@@ -161,7 +161,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       // ****************************************************************
 
-      poa->destroy (1, 1);
+      poa->destroy (true, true);
 
       orb->destroy ();
 
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp
index 72008720fa6..a366e6783c5 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp
@@ -134,7 +134,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       // ****************************************************************
 
-      poa->destroy (1, 1);
+      poa->destroy (true, true);
 
       orb->destroy ();
 
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp
index e683a8be7c9..8ad7a6de0f8 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp
@@ -207,7 +207,7 @@ RND_Driver::run (int argc, ACE_TCHAR *argv[])
 
       // ****************************************************************
 
-      poa->destroy (1, 1);
+      poa->destroy (true, true);
 
       // ****************************************************************
 
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp
index d404a69e6c5..97f5c3e325f 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp
@@ -33,7 +33,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       // ****************************************************************
 
-      poa->destroy (1, 1);
+      poa->destroy (true, true);
 
       orb->destroy ();
     }
diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp b/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp
index 9dcad7cb70e..464cd574c18 100644
--- a/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp
+++ b/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp
@@ -328,7 +328,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       // Now we can destroy the POA, the flags mean that we want to
       // wait until the POA is really destroyed
-      poa->destroy (1, 1);
+      poa->destroy (true, true);
 
       // Finally destroy the ORB
       orb->destroy ();
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp
index f61723b3279..e63814343d8 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp
@@ -177,7 +177,7 @@ ECT_Consumer_Driver::run (int argc, ACE_TCHAR* argv[])
           channel->destroy ();
         }
 
-      root_poa->destroy (1, 1);
+      root_poa->destroy (true, true);
 
       this->orb_->destroy ();
     }
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp
index bcaf9071e28..8f64e4f77f4 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp
@@ -189,7 +189,7 @@ ECT_Supplier_Driver::run (int argc, ACE_TCHAR* argv[])
 
       // @@ Deactivate the suppliers (as CORBA Objects?)
 
-      root_poa->destroy (1, 1);
+      root_poa->destroy (true, true);
 
       orb->destroy ();
 
diff --git a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp
index a9fd87264e1..341364a0add 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp
@@ -165,7 +165,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       // ****************************************************************
 
-      poa->destroy (1, 1);
+      poa->destroy (true, true);
 
       // ****************************************************************
 
diff --git a/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp b/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp
index a74ba7bdbe3..647f4ef0f66 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp
@@ -179,7 +179,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       // ****************************************************************
 
-      poa->destroy (1, 1);
+      poa->destroy (true, true);
 
       // ****************************************************************
 
diff --git a/TAO/orbsvcs/tests/Event/Basic/Complex.cpp b/TAO/orbsvcs/tests/Event/Basic/Complex.cpp
index f52fd4dbd35..4a468fdaec2 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Complex.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Complex.cpp
@@ -163,7 +163,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       // ****************************************************************
 
-      poa->destroy (1, 1);
+      poa->destroy (true, true);
 
       orb->destroy ();
 
diff --git a/TAO/orbsvcs/tests/Event/Basic/Control.cpp b/TAO/orbsvcs/tests/Event/Basic/Control.cpp
index 3f773a72e5e..64cf9f4178f 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Control.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Control.cpp
@@ -118,7 +118,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       // ****************************************************************
 
-      poa->destroy (1, 1);
+      poa->destroy (true, true);
 
       // ****************************************************************
 
diff --git a/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp
index 72681c72a93..5e21504ad0a 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp
@@ -36,7 +36,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       // ****************************************************************
 
-      poa->destroy (1, 1);
+      poa->destroy (true, true);
 
       orb->destroy ();
 
diff --git a/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp b/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp
index 35965afa1bf..cfd268f5ac6 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp
@@ -291,7 +291,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       // ****************************************************************
 
-      poa->destroy (1, 1);
+      poa->destroy (true, true);
 
       orb->destroy ();
     }
diff --git a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp
index 41ef8866b22..ffc8063c080 100644
--- a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp
@@ -37,7 +37,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       // ****************************************************************
 
-      poa->destroy (1, 1);
+      poa->destroy (true, true);
 
       orb->destroy ();
 
diff --git a/TAO/orbsvcs/tests/Event/Basic/Negation.cpp b/TAO/orbsvcs/tests/Event/Basic/Negation.cpp
index cede269c38a..ecbfa245783 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Negation.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Negation.cpp
@@ -147,7 +147,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       // ****************************************************************
 
-      poa->destroy (1, 1);
+      poa->destroy (true, true);
 
       // ****************************************************************
 
diff --git a/TAO/orbsvcs/tests/Event/Basic/Random.cpp b/TAO/orbsvcs/tests/Event/Basic/Random.cpp
index b3b557a1c89..724d404cdb9 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Random.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Random.cpp
@@ -243,7 +243,7 @@ RND_Driver::run (int argc, ACE_TCHAR *argv[])
 
       // ****************************************************************
 
-      poa->destroy (1, 1);
+      poa->destroy (true, true);
 
       // ****************************************************************
 
diff --git a/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp b/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp
index 638ea4c3101..15a1d387c55 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp
@@ -153,7 +153,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       // ****************************************************************
 
-      poa->destroy (1, 1);
+      poa->destroy (true, true);
 
       // ****************************************************************
 
diff --git a/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp b/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp
index 93eea269c6c..b97814f5a1f 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp
@@ -211,7 +211,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       // ****************************************************************
 
-      poa->destroy (1, 1);
+      poa->destroy (true, true);
 
       orb->destroy ();
 
diff --git a/TAO/orbsvcs/tests/Event/UDP/receiver.cpp b/TAO/orbsvcs/tests/Event/UDP/receiver.cpp
index c33e8119b9f..6527f2ff492 100644
--- a/TAO/orbsvcs/tests/Event/UDP/receiver.cpp
+++ b/TAO/orbsvcs/tests/Event/UDP/receiver.cpp
@@ -275,7 +275,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       // Now we can destroy the POA, the flags mean that we want to
       // wait until the POA is really destroyed
-      poa->destroy (1, 1);
+      poa->destroy (true, true);
 
       // Finally destroy the ORB
       orb->destroy ();
diff --git a/TAO/orbsvcs/tests/Event/UDP/sender.cpp b/TAO/orbsvcs/tests/Event/UDP/sender.cpp
index 19d88f50a89..1e26adc8e92 100644
--- a/TAO/orbsvcs/tests/Event/UDP/sender.cpp
+++ b/TAO/orbsvcs/tests/Event/UDP/sender.cpp
@@ -226,7 +226,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       // Now we can destroy the POA, the flags mean that we want to
       // wait until the POA is really destroyed
-      poa->destroy (1, 1);
+      poa->destroy (true, true);
 
       // Finally destroy the ORB
       orb->destroy ();
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp
index 53c65dd74e9..2b04f3871d1 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp
@@ -255,7 +255,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       // Run the ORB event loop.
       orb->run ();
 
-      root_poa->destroy (1, 1);
+      root_poa->destroy (true, true);
 
       orb->destroy ();
 
diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp
index a1cf40b7a2c..8e9f9941fa2 100644
--- a/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp
@@ -245,9 +245,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       //client.ami_test_var_->shutdown ();
 
-      root_poa->destroy (1,  // ethernalize objects
-                         0  // wait for completion
-                         );
+      root_poa->destroy (true,  // ethernalize objects
+                         false);  // wait for completion
 
       orb->destroy ();
     }
diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/server.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/server.cpp
index 6c89c1c7b26..8a9784588c9 100644
--- a/TAO/orbsvcs/tests/HTIOP/AMI/server.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/AMI/server.cpp
@@ -103,9 +103,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       orb->run ();
 
-      root_poa->destroy (1,  // ethernalize objects
-                         0  // wait for completion
-                         );
+      root_poa->destroy (true,  // ethernalize objects
+                         false);  // wait for completion
 
       orb->destroy ();
 
diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp b/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp
index 53352e04b91..9263fbe4b54 100644
--- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp
@@ -129,7 +129,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       orb->run ();
 
-      root_poa->destroy (1, 1);
+      root_poa->destroy (true, true);
 
     }
   catch (const CORBA::Exception& ex)
@@ -139,7 +139,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
     }
 
   if (!CORBA::is_nil(root_poa.in()))
-    root_poa->destroy (1,1);
+    root_poa->destroy (1, 1);
   delete servant;
 
   return 0;
diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp b/TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp
index 449144691ff..f9e6a88977e 100644
--- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp
@@ -141,7 +141,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         }
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
-      root_poa->destroy (1, 1);
+      root_poa->destroy (true, true);
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/server.cpp b/TAO/orbsvcs/tests/HTIOP/Hello/server.cpp
index 8b2779e1a30..94f7af800e4 100644
--- a/TAO/orbsvcs/tests/HTIOP/Hello/server.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/Hello/server.cpp
@@ -123,7 +123,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1);
+      root_poa->destroy (true, true);
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - Root poa destroyed\n"));
 
diff --git a/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp b/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp
index 626dd0d8ef8..fe851c004e9 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp
+++ b/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp
@@ -94,7 +94,7 @@ Server_i::init (int &argc,
       this->orb_->run ();
 
       //Destroy the POA, waiting until the destruction terminates.
-      poa->destroy (1, 1);
+      poa->destroy (true, true);
       this->orb_->destroy ();
     }
   catch (const CORBA::Exception& ex)
diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/MessengerServer.cpp b/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/MessengerServer.cpp
index bc8ddefc337..3016779a973 100644
--- a/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/MessengerServer.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/MessengerServer.cpp
@@ -111,7 +111,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       ACE_OS::sleep(1);
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("(%P|%t) Messenger server shutting down.\n")));
-      root_poa->destroy (1, 1);
+      root_poa->destroy (true, true);
       orb->destroy ();
       return 0;
     }
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp
index 1b8fe6b409f..8e0bb0fc9f7 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp
@@ -127,8 +127,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
       orb->run ();
 
-      root_poa->destroy (1,
-                         1);
+      root_poa->destroy (1, 1);
 
       orb->destroy ();
     }
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/server.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/server.cpp
index aaedcb4a1bf..c2ad5bff2bd 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/server.cpp
@@ -89,7 +89,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1);
+      root_poa->destroy (true, true);
 
       orb->destroy ();
     }
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/server.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/server.cpp
index 2c78cb4a442..3a41fc23130 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/server.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/server.cpp
@@ -88,7 +88,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       ACE_DEBUG ((LM_DEBUG, ACE_TEXT("(%P|%t) server - event loop finished\n")));
 
-      root_poa->destroy (1, 1);
+      root_poa->destroy (true, true);
 
       orb->destroy ();
     }
diff --git a/TAO/orbsvcs/tests/Miop/McastHello/server.cpp b/TAO/orbsvcs/tests/Miop/McastHello/server.cpp
index 08f366bcb8b..91edae7d562 100644
--- a/TAO/orbsvcs/tests/Miop/McastHello/server.cpp
+++ b/TAO/orbsvcs/tests/Miop/McastHello/server.cpp
@@ -97,7 +97,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1);
+      root_poa->destroy (true, true);
 
       orb->destroy ();
 
diff --git a/TAO/orbsvcs/tests/Miop/McastLocal/server.cpp b/TAO/orbsvcs/tests/Miop/McastLocal/server.cpp
index 08f366bcb8b..91edae7d562 100644
--- a/TAO/orbsvcs/tests/Miop/McastLocal/server.cpp
+++ b/TAO/orbsvcs/tests/Miop/McastLocal/server.cpp
@@ -97,7 +97,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1);
+      root_poa->destroy (true, true);
 
       orb->destroy ();
 
diff --git a/TAO/orbsvcs/tests/Miop/McastZIOP/server.cpp b/TAO/orbsvcs/tests/Miop/McastZIOP/server.cpp
index 201b71c6185..f01ac900787 100644
--- a/TAO/orbsvcs/tests/Miop/McastZIOP/server.cpp
+++ b/TAO/orbsvcs/tests/Miop/McastZIOP/server.cpp
@@ -141,7 +141,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         }
 
       // Shutdown the orb
-      root_poa->destroy (1, 1);
+      root_poa->destroy (true, true);
       orb->destroy ();
 
       // Validate that our servants got the right requests.
diff --git a/TAO/orbsvcs/tests/Notify/Validate_Client/proxy_dummy.cpp b/TAO/orbsvcs/tests/Notify/Validate_Client/proxy_dummy.cpp
index 591774c371f..a1b9e3501a9 100644
--- a/TAO/orbsvcs/tests/Notify/Validate_Client/proxy_dummy.cpp
+++ b/TAO/orbsvcs/tests/Notify/Validate_Client/proxy_dummy.cpp
@@ -182,7 +182,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1);
+      root_poa->destroy (true, true);
 
       orb->destroy ();
     }
diff --git a/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp b/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp
index f57023d75e0..27a24639088 100644
--- a/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp
+++ b/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp
@@ -316,7 +316,7 @@ int ACE_TMAIN (int ac, ACE_TCHAR *av[])
       ecf->destroy();
     }
 
-    poa->destroy (1, 1);
+    poa->destroy (true, true);
     orb->destroy ();
     poa = PortableServer::POA::_nil ();
     orb = CORBA::ORB::_nil ();
diff --git a/TAO/orbsvcs/tests/Property/server.cpp b/TAO/orbsvcs/tests/Property/server.cpp
index c356504219d..8e65a4fe98d 100644
--- a/TAO/orbsvcs/tests/Property/server.cpp
+++ b/TAO/orbsvcs/tests/Property/server.cpp
@@ -86,7 +86,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       // Run the ORB Event loop.
       orb->run ();
 
-      root_poa->destroy (1, 1);
+      root_poa->destroy (true, true);
 
       orb->destroy ();
     }
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp b/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp
index 32eab375998..9c81e257b95 100644
--- a/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp
+++ b/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp
@@ -170,7 +170,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
           ACE_OS::abort ();
         }
 
-      root_poa->destroy (1, 1);
+      root_poa->destroy (true, true);
 
       orb->destroy ();
     }
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/server.cpp b/TAO/orbsvcs/tests/Security/BiDirectional/server.cpp
index ce7fd2a4524..0b3a484f806 100644
--- a/TAO/orbsvcs/tests/Security/BiDirectional/server.cpp
+++ b/TAO/orbsvcs/tests/Security/BiDirectional/server.cpp
@@ -141,7 +141,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         }
       ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("event loop finished\n")));
 
-      root_poa->destroy (1, 1);
+      root_poa->destroy (true, true);
 
       orb->destroy ();
     }
diff --git a/TAO/orbsvcs/tests/Security/Bug_1107_Regression/server.cpp b/TAO/orbsvcs/tests/Security/Bug_1107_Regression/server.cpp
index 6612b8f50c0..18ed207e4b1 100644
--- a/TAO/orbsvcs/tests/Security/Bug_1107_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Security/Bug_1107_Regression/server.cpp
@@ -136,7 +136,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
                   "\n"
                   "Event loop finished.\n"));
 
-      root_poa->destroy (1, 1);
+      root_poa->destroy (true, true);
 
       orb->destroy ();
     }
diff --git a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/MessengerServer.cpp b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/MessengerServer.cpp
index 1a23c3f50a4..9e692470a23 100644
--- a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/MessengerServer.cpp
+++ b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/MessengerServer.cpp
@@ -86,7 +86,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
     // Accept requests
     orb->run();
 
-    poa->destroy (1, 1);
+    poa->destroy (true, true);
 
     orb->destroy();
   }
diff --git a/TAO/orbsvcs/tests/Security/Callback/client.cpp b/TAO/orbsvcs/tests/Security/Callback/client.cpp
index 01c2927159f..723a82b5006 100644
--- a/TAO/orbsvcs/tests/Security/Callback/client.cpp
+++ b/TAO/orbsvcs/tests/Security/Callback/client.cpp
@@ -120,7 +120,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       server_obj->shutdown ();
 
-      poa->destroy (1, 1);
+      poa->destroy (true, true);
 
       orb->destroy ();
     }
diff --git a/TAO/orbsvcs/tests/Security/Callback/server.cpp b/TAO/orbsvcs/tests/Security/Callback/server.cpp
index 3df90db03c0..b08537aa825 100644
--- a/TAO/orbsvcs/tests/Security/Callback/server.cpp
+++ b/TAO/orbsvcs/tests/Security/Callback/server.cpp
@@ -101,7 +101,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       orb->run ();
 
-      poa->destroy (1, 1);
+      poa->destroy (true, true);
 
       orb->destroy ();
     }
diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp b/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp
index 667b02c61a4..2bc01f9b689 100644
--- a/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp
+++ b/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp
@@ -123,9 +123,9 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "SERVER (%P): Event loop finished.\n"));
 
-      persistent_poa->destroy (1, 1);
+      persistent_poa->destroy (true, true);
 
-      root_poa->destroy (1, 1);
+      root_poa->destroy (true, true);
 
       ACE_OS::sleep (1);
 
diff --git a/TAO/orbsvcs/tests/Security/EndpointPolicy/test.cpp b/TAO/orbsvcs/tests/Security/EndpointPolicy/test.cpp
index df9c4ed4ffc..d2b7d81cd64 100644
--- a/TAO/orbsvcs/tests/Security/EndpointPolicy/test.cpp
+++ b/TAO/orbsvcs/tests/Security/EndpointPolicy/test.cpp
@@ -181,7 +181,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
     {
       ex._tao_print_exception ("cannot run server");
     }
-  root_poa->destroy (1, 1);
+  root_poa->destroy (true, true);
 
   orb->destroy ();
 
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/client.cpp b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/client.cpp
index 264e4098f8d..14056b16ec7 100644
--- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/client.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/client.cpp
@@ -137,8 +137,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
                   "(%P|%t) Number of events received.. [%d]\n",
                   count));
 
-      root_poa->destroy (1,
-                         1);
+      root_poa->destroy (1, 1);
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/server.cpp b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/server.cpp
index ce5b925c9e8..68a39ceda53 100644
--- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/server.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/server.cpp
@@ -163,8 +163,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       ACE_Thread_Manager::instance ()->wait ();
 
-      root_poa->destroy (1,
-                         1);
+      root_poa->destroy (1, 1);
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/orbsvcs/tests/Security/Null_Cipher/server.cpp b/TAO/orbsvcs/tests/Security/Null_Cipher/server.cpp
index 64e2e62e4bb..9b4a9f781a2 100644
--- a/TAO/orbsvcs/tests/Security/Null_Cipher/server.cpp
+++ b/TAO/orbsvcs/tests/Security/Null_Cipher/server.cpp
@@ -95,7 +95,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
                   "\n"
                   "Event loop finished.\n"));
 
-      root_poa->destroy (1, 1);
+      root_poa->destroy (true, true);
 
       orb->destroy ();
     }
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp b/TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp
index d907397ce08..c8fc2390ff8 100644
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp
@@ -125,7 +125,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
                   "\n"
                   "Event loop finished.\n"));
 
-      root_poa->destroy (1, 1);
+      root_poa->destroy (true, true);
 
       orb->destroy ();
     }
diff --git a/TAO/orbsvcs/tests/ior_corbaname/server.cpp b/TAO/orbsvcs/tests/ior_corbaname/server.cpp
index e3908eeba4b..cafd991d555 100644
--- a/TAO/orbsvcs/tests/ior_corbaname/server.cpp
+++ b/TAO/orbsvcs/tests/ior_corbaname/server.cpp
@@ -47,7 +47,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       orb->run ();
 
       // Destroy the POA, waiting until the destruction terminates
-      poa->destroy (1, 1);
+      poa->destroy (true, true);
       orb->destroy ();
 
     }