ChangeLogTag:Sun Mar 04 09:44:18 2001 Ossama Othman <ossama@uci.edu>

13 files changed, 53 insertions, 12 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 9a571a6d8c7..f5c610b6ba1 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,26 @@
+Sun Mar 04 09:44:18 2001  Ossama Othman  <ossama@uci.edu>
+
+	* tests/BiDirectional/client.cpp (main):
+	* tests/BiDirectional/server.cpp (main):
+	* tests/BiDirectional_NestedUpcall/client.cpp (main):
+	* tests/BiDirectional_NestedUpcall/server.cpp (main):
+	* tests/MProfile/server.cpp (main):
+	* tests/MProfile_Forwarding/Manager.cpp (init):
+	* tests/MProfile_Forwarding/server.cpp (main):
+	* tests/QtTests/server.cpp (main):
+	* tests/Smart_Proxies/Collocation/Coll_Tester.cpp (init):
+	* tests/Xt_Stopwatch/server.cpp (main):
+
+	  Added missing ACE_TRY_ENV parameter to
+	  resolve_initial_references() call, and the corresponding
+	  ACE_CHECK/ACE_CHECK_RETURN/ACE_TRY_CHECK macro.
+
+	* tests/Smart_Proxies/Benchmark/server.cpp (main):
+	* tests/Smart_Proxies/Policy/server.cpp (main):
+
+	  Added missing ACE_TRY_CHECK after resolve_initial_references()
+	  call.
+
 Sun Mar 04 09:12:40 2001  Ossama Othman  <ossama@uci.edu>
 
 	* tao/IFR_Client/InterfaceC.cpp:
diff --git a/TAO/tests/BiDirectional/client.cpp b/TAO/tests/BiDirectional/client.cpp
index f195e507f0b..6fa6aa221e4 100644
--- a/TAO/tests/BiDirectional/client.cpp
+++ b/TAO/tests/BiDirectional/client.cpp
@@ -47,7 +47,9 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA");
+        orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
                            " (%P|%t) Unable to initialize the POA.\n"),
diff --git a/TAO/tests/BiDirectional/server.cpp b/TAO/tests/BiDirectional/server.cpp
index fbd143f8e42..9c1683a589a 100644
--- a/TAO/tests/BiDirectional/server.cpp
+++ b/TAO/tests/BiDirectional/server.cpp
@@ -47,7 +47,9 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA");
+        orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
                            " (%P|%t) Unable to initialize the POA.\n"),
diff --git a/TAO/tests/BiDirectional_NestedUpcall/client.cpp b/TAO/tests/BiDirectional_NestedUpcall/client.cpp
index c9365e9a235..2593a3d71d9 100644
--- a/TAO/tests/BiDirectional_NestedUpcall/client.cpp
+++ b/TAO/tests/BiDirectional_NestedUpcall/client.cpp
@@ -48,7 +48,9 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA");
+        orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
                            " (%P|%t) Unable to initialize the POA.\n"),
diff --git a/TAO/tests/BiDirectional_NestedUpcall/server.cpp b/TAO/tests/BiDirectional_NestedUpcall/server.cpp
index e669836949b..b20bd53bcec 100644
--- a/TAO/tests/BiDirectional_NestedUpcall/server.cpp
+++ b/TAO/tests/BiDirectional_NestedUpcall/server.cpp
@@ -47,7 +47,9 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA");
+        orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
                            " (%P|%t) Unable to initialize the POA.\n"),
diff --git a/TAO/tests/MProfile/server.cpp b/TAO/tests/MProfile/server.cpp
index 2d638ca33cc..7d91591bccc 100644
--- a/TAO/tests/MProfile/server.cpp
+++ b/TAO/tests/MProfile/server.cpp
@@ -42,7 +42,9 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA");
+        orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
                            " (%P|%t) Unable to initialize the POA.\n"),
diff --git a/TAO/tests/MProfile_Forwarding/Manager.cpp b/TAO/tests/MProfile_Forwarding/Manager.cpp
index bb7e6b5c4f3..700a76a2070 100644
--- a/TAO/tests/MProfile_Forwarding/Manager.cpp
+++ b/TAO/tests/MProfile_Forwarding/Manager.cpp
@@ -104,7 +104,8 @@ Manager::init (int argc,
 
   // Obtain the RootPOA.
   CORBA::Object_var obj_var =
-    this->orb_->resolve_initial_references ("RootPOA");
+    this->orb_->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+  ACE_CHECK_RETURN (-1);
 
   // Get the POA_var object from Object_var.
   PortableServer::POA_var root_poa_var =
diff --git a/TAO/tests/MProfile_Forwarding/server.cpp b/TAO/tests/MProfile_Forwarding/server.cpp
index ecc88e5f3b0..47c475b7dd9 100755
--- a/TAO/tests/MProfile_Forwarding/server.cpp
+++ b/TAO/tests/MProfile_Forwarding/server.cpp
@@ -42,7 +42,9 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA");
+        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
                            " (%P|%t) Unable to initialize the POA.\n"),
diff --git a/TAO/tests/QtTests/server.cpp b/TAO/tests/QtTests/server.cpp
index 63cd1d0929b..33acfad1cd2 100755
--- a/TAO/tests/QtTests/server.cpp
+++ b/TAO/tests/QtTests/server.cpp
@@ -71,7 +71,8 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA");
+        orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+      ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/tests/Smart_Proxies/Benchmark/server.cpp b/TAO/tests/Smart_Proxies/Benchmark/server.cpp
index 6ff0b93ec3f..07341248d62 100644
--- a/TAO/tests/Smart_Proxies/Benchmark/server.cpp
+++ b/TAO/tests/Smart_Proxies/Benchmark/server.cpp
@@ -116,8 +116,9 @@ main (int argc, char *argv[])
       Test_i servant (orb.in ());      
       // Obtain RootPOA.
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA", 
+        orb->resolve_initial_references ("RootPOA",
                                          ACE_TRY_ENV);
+      ACE_TRY_CHECK;
       
       PortableServer::POA_var root_poa = 
         PortableServer::POA::_narrow (object.in (),
diff --git a/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.cpp b/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.cpp
index e2e0bc922f7..cfe0ba58e66 100644
--- a/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.cpp
+++ b/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.cpp
@@ -34,7 +34,8 @@ Collocation_Test::init (int argc, char *argv[], CORBA::Environment &ACE_TRY_ENV)
 
   // Get an Object reference to RootPOA.
   CORBA::Object_var obj =
-    this->orb_->resolve_initial_references ("RootPOA");
+    this->orb_->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+  ACE_CHECK_RETURN (-1);
 
   // Narrow the Object reference to a POA reference
   this->root_poa_ =
diff --git a/TAO/tests/Smart_Proxies/Policy/server.cpp b/TAO/tests/Smart_Proxies/Policy/server.cpp
index 22768dc39b3..eacd1458aff 100644
--- a/TAO/tests/Smart_Proxies/Policy/server.cpp
+++ b/TAO/tests/Smart_Proxies/Policy/server.cpp
@@ -114,8 +114,9 @@ main (int argc, char *argv[])
       Test_i servant (orb.in ());      
       // Obtain RootPOA.
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA", 
+        orb->resolve_initial_references ("RootPOA",
                                          ACE_TRY_ENV);
+      ACE_TRY_CHECK;
       
       PortableServer::POA_var root_poa = 
         PortableServer::POA::_narrow (object.in (),
diff --git a/TAO/tests/Xt_Stopwatch/server.cpp b/TAO/tests/Xt_Stopwatch/server.cpp
index 4b98a3f1d71..e7c69d49af1 100644
--- a/TAO/tests/Xt_Stopwatch/server.cpp
+++ b/TAO/tests/Xt_Stopwatch/server.cpp
@@ -81,7 +81,8 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA");
+        orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+      ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,