ChangeLogTag: Sun Mar 04 08:10:04 2001 Irfan Pyarali <irfan@cs.wustl.edu>

20 files changed, 103 insertions, 89 deletions

diff --git a/TAO/examples/POA/Adapter_Activator/server.cpp b/TAO/examples/POA/Adapter_Activator/server.cpp
index 4d1e25cf9ed..843161b5c86 100644
--- a/TAO/examples/POA/Adapter_Activator/server.cpp
+++ b/TAO/examples/POA/Adapter_Activator/server.cpp
@@ -280,7 +280,10 @@ main (int argc, char **argv)
         return result;
 
       // Obtain the RootPOA.
-      CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA");
+      CORBA::Object_var obj =
+        orb->resolve_initial_references ("RootPOA",
+                                         ACE_TRY_ENV);
+      ACE_TRY_CHECK;
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
diff --git a/TAO/examples/POA/DSI/Database_i.cpp b/TAO/examples/POA/DSI/Database_i.cpp
index 7adc29a9630..e86fe3ffbfd 100644
--- a/TAO/examples/POA/DSI/Database_i.cpp
+++ b/TAO/examples/POA/DSI/Database_i.cpp
@@ -6,7 +6,7 @@
 ACE_RCSID(DSI, Database_i, "$Id$")
 
 DatabaseImpl::Simpler_Database_Malloc::Simpler_Database_Malloc (void)
-//  : DATABASE_MALLOC ()
+  //  : DATABASE_MALLOC ()
 {
 }
 
diff --git a/TAO/examples/POA/DSI/server.cpp b/TAO/examples/POA/DSI/server.cpp
index 334038c62a3..33678266e96 100644
--- a/TAO/examples/POA/DSI/server.cpp
+++ b/TAO/examples/POA/DSI/server.cpp
@@ -81,29 +81,27 @@ main (int argc, char **argv)
 {
   ACE_DECLARE_NEW_CORBA_ENV;
 
-  char str[256];
   ACE_TRY
     {
-      ACE_OS::strcpy (str,"CORBA::ORB_init");
       // Initialize the ORB
       CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0, ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-
       int result = parse_args (argc, argv);
       if (result != 0)
         return result;
 
-      // Get the Root POA object reference
-      CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA");
+      // Obtain the RootPOA.
+      CORBA::Object_var obj =
+        orb->resolve_initial_references ("RootPOA",
+                                         ACE_TRY_ENV);
+      ACE_TRY_CHECK;
 
-      ACE_OS::strcpy (str,"PortableServer::POA::_narrow");
       // Narrow the object reference to a POA reference
       PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in (),
                                                                        ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      ACE_OS::strcpy (str, "PortableServer::POA::the_POAManager");
       PortableServer::POAManager_var poa_manager =
         root_poa->the_POAManager (ACE_TRY_ENV);
       ACE_TRY_CHECK;
@@ -111,38 +109,32 @@ main (int argc, char **argv)
       CORBA::PolicyList policies (5);
       policies.length (5);
 
-      ACE_OS::strcpy (str, "PortableServer::POA::create_id_assignment_policy");
       // ID Assignment Policy
       policies[0] =
         root_poa->create_id_assignment_policy (PortableServer::USER_ID, ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      ACE_OS::strcpy (str,"PortableServer::POA::create_lifespan_policy");
       // Lifespan Policy
       policies[1] =
         root_poa->create_lifespan_policy (PortableServer::PERSISTENT,
                                           ACE_TRY_ENV);
 
-      ACE_OS::strcpy (str,"PortableServer::POA::create_request_processing_policy");
       // Request Processing Policy
       policies[2] =
         root_poa->create_request_processing_policy (PortableServer::USE_DEFAULT_SERVANT,
                                                     ACE_TRY_ENV);
 
-      ACE_OS::strcpy (str,"PortableServer::POA::create_servant_retention_policy");
       // Servant Retention Policy
       policies[3] =
         root_poa->create_servant_retention_policy (PortableServer::RETAIN, ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      ACE_OS::strcpy (str,"PortableServer::POA::create_id_uniqueness_policy");
       // Id Uniqueness Policy
       policies[4] =
         root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID, ACE_TRY_ENV);
 
       ACE_TRY_CHECK;
 
-      ACE_OS::strcpy (str,"PortableServer::POA::create_POA");
       ACE_CString name = "firstPOA";
       PortableServer::POA_var first_poa = root_poa->create_POA (name.c_str (),
                                                                 poa_manager.in (),
@@ -150,7 +142,6 @@ main (int argc, char **argv)
                                                                 ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      ACE_OS::strcpy (str, "PortableServer::POA::create_POA");
       for (CORBA::ULong i = 0;
            i < policies.length ();
            ++i)
@@ -169,19 +160,15 @@ main (int argc, char **argv)
       PortableServer::ObjectId_var database_agent_oid =
         PortableServer::string_to_ObjectId ("DatabaseAgent");
 
-      ACE_OS::strcpy (str, "PortableServer::POA::activate_object_with_id");
       first_poa->activate_object_with_id (database_agent_oid.in (),
                                           &database_agent_impl,
                                           ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      ACE_OS::strcpy (str, "PortableServer::POA::id_to_reference");
       CORBA::Object_var database_agent =
         first_poa->id_to_reference (database_agent_oid.in (), ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      ACE_OS::strcpy (str, "CORBA::ORB::object_to_string");
-
       // Get the IOR for the "DatabaseAgent" object
       CORBA::String_var database_agent_ior =
         orb->object_to_string (database_agent.in (), ACE_TRY_ENV);
@@ -194,7 +181,6 @@ main (int argc, char **argv)
       if (write_result != 0)
         return write_result;
 
-      ACE_OS::strcpy (str, "PortableServer::POAManager::activate");
       // set the state of the poa_manager to active i.e ready to process requests
       poa_manager->activate (ACE_TRY_ENV);
       ACE_TRY_CHECK;
@@ -205,11 +191,11 @@ main (int argc, char **argv)
     }
   ACE_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, str);
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught");
       return -1;
     }
   ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
+  ACE_CHECK_RETURN (-1);
 
- return 0;
+  return 0;
 }
diff --git a/TAO/examples/POA/Default_Servant/File_i.cpp b/TAO/examples/POA/Default_Servant/File_i.cpp
index 305ffb8c207..29fd3c344cf 100644
--- a/TAO/examples/POA/Default_Servant/File_i.cpp
+++ b/TAO/examples/POA/Default_Servant/File_i.cpp
@@ -20,9 +20,9 @@ ACE_RCSID(Default_Servant, File_i, "$Id$")
 
 // IDL File::System constructor
 FileImpl::System::System (PortableServer::POA_ptr poa)
- : poa_ (PortableServer::POA::_duplicate (poa)),
-   // Create the Default Descriptor Servant
-   fd_servant_ (poa)
+  : poa_ (PortableServer::POA::_duplicate (poa)),
+    // Create the Default Descriptor Servant
+    fd_servant_ (poa)
 {
   ACE_DECLARE_NEW_CORBA_ENV;
   // set the default servant of the POA
diff --git a/TAO/examples/POA/Default_Servant/server.cpp b/TAO/examples/POA/Default_Servant/server.cpp
index 5a34e913b69..534d4e4c43b 100644
--- a/TAO/examples/POA/Default_Servant/server.cpp
+++ b/TAO/examples/POA/Default_Servant/server.cpp
@@ -70,8 +70,11 @@ main (int argc, char **argv)
       if (result != 0)
         return result;
 
-      // Get the Root POA object reference
-      CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA");
+      // Obtain the RootPOA.
+      CORBA::Object_var obj =
+        orb->resolve_initial_references ("RootPOA",
+                                         ACE_TRY_ENV);
+      ACE_TRY_CHECK;
 
       // Narrow the object reference to a POA reference
       PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in (), ACE_TRY_ENV);
@@ -83,7 +86,7 @@ main (int argc, char **argv)
       CORBA::PolicyList policies (5);
       policies.length (5);
 
-  // ID Assignment Policy
+      // ID Assignment Policy
       policies[0] =
         root_poa->create_id_assignment_policy (PortableServer::USER_ID, ACE_TRY_ENV);
       ACE_TRY_CHECK;
diff --git a/TAO/examples/POA/Explicit_Activation/server.cpp b/TAO/examples/POA/Explicit_Activation/server.cpp
index 456e3c712b3..45845344730 100644
--- a/TAO/examples/POA/Explicit_Activation/server.cpp
+++ b/TAO/examples/POA/Explicit_Activation/server.cpp
@@ -140,8 +140,10 @@ main (int argc, char **argv)
         return result;
 
       // Obtain the RootPOA.
-      CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA",
-                                                               ACE_TRY_ENV);
+      CORBA::Object_var obj =
+        orb->resolve_initial_references ("RootPOA",
+                                         ACE_TRY_ENV);
+      ACE_TRY_CHECK;
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
diff --git a/TAO/examples/POA/FindPOA/FindPOA.cpp b/TAO/examples/POA/FindPOA/FindPOA.cpp
index 632ac463cea..c39ef88b454 100644
--- a/TAO/examples/POA/FindPOA/FindPOA.cpp
+++ b/TAO/examples/POA/FindPOA/FindPOA.cpp
@@ -29,19 +29,17 @@ main (int argc, char **argv)
   ACE_DECLARE_NEW_CORBA_ENV;
 
   // Initialize the ORB
-  char str[256]; // Exception message
   ACE_TRY
     {
-      ACE_OS::strcpy (str, "CORBA::ORB_init");
-
       CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0, ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      // Get Object reference to RootPOA.
+      // Obtain the RootPOA.
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA");
+        orb->resolve_initial_references ("RootPOA",
+                                         ACE_TRY_ENV);
+      ACE_TRY_CHECK;
 
-      ACE_OS::strcpy (str, "PortableServer::POA::_narrow");
       // Narrow Object reference to RootPOA to a POA reference.
       PortableServer::POA_var root_poa =
         PortableServer::POA::_narrow (obj.in(), ACE_TRY_ENV);
@@ -61,14 +59,12 @@ main (int argc, char **argv)
 
       // Register the TAO_Adapter_Activator reference to be the RootPOA's
       // Adapter Activator.
-      ACE_OS::strcpy (str,"PortableServer::POA::the_activator");
       root_poa->the_activator (activator.in (),
                                ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
       // Try to find a childPOA of RootPOA named firstPOA
       ACE_CString name = "firstPOA";
-      ACE_OS::strcpy (str,"PortableServer::POA::find_POA");
       PortableServer::POA_var first_poa =
         root_poa->find_POA (name.c_str (),
                             1,
@@ -83,8 +79,6 @@ main (int argc, char **argv)
       ACE_TRY_CHECK;
 
       // Get the names of all the POAs
-      ACE_OS::strcpy (str, "PortableServer::POA::_narrow");
-
       CORBA::String_var root_poa_name =
         root_poa->the_name (ACE_TRY_ENV);
       ACE_TRY_CHECK;
@@ -105,7 +99,7 @@ main (int argc, char **argv)
     }
   ACE_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, str);
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught");
       return -1;
     }
   ACE_ENDTRY;
diff --git a/TAO/examples/POA/Forwarding/server.cpp b/TAO/examples/POA/Forwarding/server.cpp
index 43623dc0ff1..43be0d9f24d 100644
--- a/TAO/examples/POA/Forwarding/server.cpp
+++ b/TAO/examples/POA/Forwarding/server.cpp
@@ -186,7 +186,9 @@ main (int argc,
 
       // Obtain the RootPOA.
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA");
+        orb->resolve_initial_references ("RootPOA",
+                                         ACE_TRY_ENV);
+      ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
         PortableServer::POA::_narrow (obj.in (),
diff --git a/TAO/examples/POA/Loader/Server_Manager.cpp b/TAO/examples/POA/Loader/Server_Manager.cpp
index 3988d01dc8d..fe07a02a6b8 100644
--- a/TAO/examples/POA/Loader/Server_Manager.cpp
+++ b/TAO/examples/POA/Loader/Server_Manager.cpp
@@ -6,8 +6,8 @@
 ACE_RCSID(Loader, Server_Manager, "$Id$")
 
 Server_i::Server_i(void)
-    : ior_output_file_ (0),
-      policies_ (4)
+  : ior_output_file_ (0),
+    policies_ (4)
 {
 }
 
@@ -123,9 +123,11 @@ Server_i::init (int argc, char **argv)
       if (result != 0)
         return result;
 
-      // Get an Object reference to RootPOA.
+      // Obtain the RootPOA.
       CORBA::Object_var obj =
-        orb_->resolve_initial_references ("RootPOA");
+        orb_->resolve_initial_references ("RootPOA",
+                                          ACE_TRY_ENV);
+      ACE_TRY_CHECK;
 
       // Narrow the Object reference to a POA reference
       root_poa_ = PortableServer::POA::_narrow (obj.in (),
@@ -187,16 +189,16 @@ Server_i::create_poa (const char *name,
 
       // Servant Retention Policy.
       if (servant_retention_policy == 1)
-      policies_[3] =
-        root_poa_->create_servant_retention_policy
-        (PortableServer::RETAIN,
-         ACE_TRY_ENV);
+        policies_[3] =
+          root_poa_->create_servant_retention_policy
+          (PortableServer::RETAIN,
+           ACE_TRY_ENV);
 
       if (servant_retention_policy == 0)
-      policies_[3] =
-        root_poa_->create_servant_retention_policy
-        (PortableServer::NON_RETAIN,
-         ACE_TRY_ENV);
+        policies_[3] =
+          root_poa_->create_servant_retention_policy
+          (PortableServer::NON_RETAIN,
+           ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
       // Create myPOA as the child of RootPOA with the above
@@ -340,12 +342,12 @@ Server_i::run (void)
 
       CORBA::String_var first_foo_ior =
         orb_->object_to_string (first_foo_.in (),
-                               ACE_TRY_ENV);
+                                ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
       CORBA::String_var second_foo_ior =
         orb_->object_to_string (second_foo_.in (),
-                               ACE_TRY_ENV);
+                                ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
       // Print the ior's of first_foo and second_foo.
diff --git a/TAO/examples/POA/NewPOA/NewPOA.cpp b/TAO/examples/POA/NewPOA/NewPOA.cpp
index 596e6e32095..5d1499f6118 100644
--- a/TAO/examples/POA/NewPOA/NewPOA.cpp
+++ b/TAO/examples/POA/NewPOA/NewPOA.cpp
@@ -67,9 +67,11 @@ main (int argc, char **argv)
                                             ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      // Obtain the object reference to the RootPOA.
+      // Obtain the RootPOA.
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA");
+        orb->resolve_initial_references ("RootPOA",
+                                         ACE_TRY_ENV);
+      ACE_TRY_CHECK;
 
       // _narrow() the Object to get the POA object, i.e., the root_poa.
       PortableServer::POA_var root_poa =
diff --git a/TAO/examples/POA/On_Demand_Activation/server.cpp b/TAO/examples/POA/On_Demand_Activation/server.cpp
index 875341ff073..5dd24227734 100644
--- a/TAO/examples/POA/On_Demand_Activation/server.cpp
+++ b/TAO/examples/POA/On_Demand_Activation/server.cpp
@@ -112,9 +112,11 @@ main (int argc, char **argv)
       if (result != 0)
         return result;
 
-      // Get an Object reference to RootPOA.
+      // Obtain the RootPOA.
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA");
+        orb->resolve_initial_references ("RootPOA",
+                                         ACE_TRY_ENV);
+      ACE_TRY_CHECK;
 
       // Narrow the Object reference to a POA reference
       PortableServer::POA_var root_poa =
diff --git a/TAO/examples/POA/On_Demand_Loading/Server_Manager.cpp b/TAO/examples/POA/On_Demand_Loading/Server_Manager.cpp
index 3818fa20739..966751c4dd4 100644
--- a/TAO/examples/POA/On_Demand_Loading/Server_Manager.cpp
+++ b/TAO/examples/POA/On_Demand_Loading/Server_Manager.cpp
@@ -5,8 +5,8 @@
 ACE_RCSID(On_Demand_Loading, Server_Manager, "$Id$")
 
 Server_i::Server_i(void)
-    : ior_output_file_ (0),
-      policies_ (4)
+  : ior_output_file_ (0),
+    policies_ (4)
 {
 }
 
@@ -122,9 +122,11 @@ Server_i::init (int argc, char **argv)
       if (result != 0)
         return result;
 
-      // Get an Object reference to RootPOA.
+      // Obtain the RootPOA.
       CORBA::Object_var obj =
-        orb_->resolve_initial_references ("RootPOA");
+        orb_->resolve_initial_references ("RootPOA",
+                                          ACE_TRY_ENV);
+      ACE_TRY_CHECK;
 
       // Narrow the Object reference to a POA reference
       root_poa_ = PortableServer::POA::_narrow (obj.in (),
@@ -184,17 +186,17 @@ Server_i::create_poa (const char *name,
 
       // Servant Retention Policy.
       if (servant_retention_policy == 1)
-      policies_[3] =
-        root_poa_->create_servant_retention_policy
-        (PortableServer::RETAIN,
-         ACE_TRY_ENV);
+        policies_[3] =
+          root_poa_->create_servant_retention_policy
+          (PortableServer::RETAIN,
+           ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
       if (servant_retention_policy == 0)
-      policies_[3] =
-        root_poa_->create_servant_retention_policy
-        (PortableServer::NON_RETAIN,
-         ACE_TRY_ENV);
+        policies_[3] =
+          root_poa_->create_servant_retention_policy
+          (PortableServer::NON_RETAIN,
+           ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
       // Create myPOA as the child of RootPOA with the above
@@ -330,12 +332,12 @@ Server_i::run (void)
 
       CORBA::String_var first_foo_ior =
         orb_->object_to_string (first_foo_.in (),
-                               ACE_TRY_ENV);
+                                ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
       CORBA::String_var second_foo_ior =
         orb_->object_to_string (second_foo_.in (),
-                               ACE_TRY_ENV);
+                                ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
       // Print the ior's of first_foo and second_foo.
diff --git a/TAO/examples/POA/Reference_Counted_Servant/server.cpp b/TAO/examples/POA/Reference_Counted_Servant/server.cpp
index 8185e99fad6..7549c897e63 100644
--- a/TAO/examples/POA/Reference_Counted_Servant/server.cpp
+++ b/TAO/examples/POA/Reference_Counted_Servant/server.cpp
@@ -124,7 +124,10 @@ main (int argc, char **argv)
         return result;
 
       // Obtain the RootPOA.
-      CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA");
+      CORBA::Object_var obj =
+        orb->resolve_initial_references ("RootPOA",
+                                         ACE_TRY_ENV);
+      ACE_TRY_CHECK;
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
diff --git a/TAO/examples/POA/RootPOA/RootPOA.cpp b/TAO/examples/POA/RootPOA/RootPOA.cpp
index f8ea52c8152..b6ab90b0029 100644
--- a/TAO/examples/POA/RootPOA/RootPOA.cpp
+++ b/TAO/examples/POA/RootPOA/RootPOA.cpp
@@ -37,7 +37,8 @@ main (int argc, char **argv)
       // Resolve the initial references for the name RootPOA thus getting
       // an object of type CORBA::Object.
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA",
+                                         ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
       // apply _narrow on the object of type CORBA::Object, to make it
diff --git a/TAO/examples/POA/TIE/server.cpp b/TAO/examples/POA/TIE/server.cpp
index 1e2d1eb506b..66dd5bef4b5 100644
--- a/TAO/examples/POA/TIE/server.cpp
+++ b/TAO/examples/POA/TIE/server.cpp
@@ -35,7 +35,10 @@ main (int argc, char **argv)
       ACE_TRY_CHECK;
 
       // Obtain the RootPOA.
-      CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA");
+      CORBA::Object_var obj =
+        orb->resolve_initial_references ("RootPOA",
+                                         ACE_TRY_ENV);
+      ACE_TRY_CHECK;
 
       ACE_OS::strcpy (str, "PortableServer::POA::_narrow");
 
diff --git a/TAO/tests/POA/Deactivation/Deactivation.cpp b/TAO/tests/POA/Deactivation/Deactivation.cpp
index 6dfd62612ff..71a2f5c9b3e 100644
--- a/TAO/tests/POA/Deactivation/Deactivation.cpp
+++ b/TAO/tests/POA/Deactivation/Deactivation.cpp
@@ -185,8 +185,10 @@ main (int argc, char **argv)
       ACE_TRY_CHECK;
 
       // Obtain the RootPOA.
-      CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA",
-                                                               ACE_TRY_ENV);
+      CORBA::Object_var obj =
+        orb->resolve_initial_references ("RootPOA",
+                                         ACE_TRY_ENV);
+      ACE_TRY_CHECK;
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
diff --git a/TAO/tests/POA/Destruction/Destruction.cpp b/TAO/tests/POA/Destruction/Destruction.cpp
index 13f0d2c34b0..f8e80346996 100644
--- a/TAO/tests/POA/Destruction/Destruction.cpp
+++ b/TAO/tests/POA/Destruction/Destruction.cpp
@@ -56,8 +56,10 @@ main (int argc, char **argv)
       ACE_TRY_CHECK;
 
       // Obtain the RootPOA.
-      CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA",
-                                                               ACE_TRY_ENV);
+      CORBA::Object_var obj =
+        orb->resolve_initial_references ("RootPOA",
+                                         ACE_TRY_ENV);
+      ACE_TRY_CHECK;
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
diff --git a/TAO/tests/POA/Identity/Identity.cpp b/TAO/tests/POA/Identity/Identity.cpp
index c0cc2c4eada..ed1a02d6819 100644
--- a/TAO/tests/POA/Identity/Identity.cpp
+++ b/TAO/tests/POA/Identity/Identity.cpp
@@ -702,8 +702,10 @@ main (int argc, char **argv)
                                             ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA",
-                                                               ACE_TRY_ENV);
+      // Obtain the RootPOA.
+      CORBA::Object_var obj =
+        orb->resolve_initial_references ("RootPOA",
+                                         ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in (),
diff --git a/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.cpp b/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.cpp
index ef1f350156d..431ca90b91b 100644
--- a/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.cpp
+++ b/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.cpp
@@ -86,8 +86,10 @@ main (int argc, char **argv)
       ACE_TRY_CHECK;
 
       // Obtain the RootPOA.
-      CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA",
-                                                               ACE_TRY_ENV);
+      CORBA::Object_var obj =
+        orb->resolve_initial_references ("RootPOA",
+                                         ACE_TRY_ENV);
+      ACE_TRY_CHECK;
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
diff --git a/TAO/tests/POA/wait_for_completion/wait_for_completion.cpp b/TAO/tests/POA/wait_for_completion/wait_for_completion.cpp
index 9ee9cbddb47..0af736281c0 100644
--- a/TAO/tests/POA/wait_for_completion/wait_for_completion.cpp
+++ b/TAO/tests/POA/wait_for_completion/wait_for_completion.cpp
@@ -61,8 +61,9 @@ init_orb (int argc,
   ACE_CHECK_RETURN (PortableServer::POA::_nil ());
 
   // Obtain the RootPOA.
-  CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA",
-                                                           ACE_TRY_ENV);
+  CORBA::Object_var obj =
+    orb->resolve_initial_references ("RootPOA",
+                                     ACE_TRY_ENV);
   ACE_CHECK_RETURN (PortableServer::POA::_nil ());
 
   // Get the POA_var object from Object_var.