ChangeLogTag:Mon Mar 5 18:40:58 2001 Carlos O'Ryan <coryan@uci.edu>

4 files changed, 26 insertions, 19 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index ad7de1d51b4..160ea4074af 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,20 +1,29 @@
+Mon Mar  5 18:40:58 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * orbsvcs/tests/Event/lib/Driver.cpp:
+          Replaced ACE_TRY_CHECK with ACE_CHECK
+
+        * tests/AMI/client.cpp:
+        * tests/AMI/server.cpp:
+          Fixed misuse of ACE_CHECK_RETURN
+
 Mon Mar 05 20:29:00 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
 
-	* tests/Collocation/Coll_Tester.cpp (init): Adding missing
-	  ACE_TRY_ENV to resolve_initial_reference().  Thanks to Ossama
-	  for pointing this out.
+        * tests/Collocation/Coll_Tester.cpp (init): Adding missing
+          ACE_TRY_ENV to resolve_initial_reference().  Thanks to Ossama
+          for pointing this out.
 
 Mon Mar  5 19:54:25 2001  Yamuna Krishnamurthy  <yamuna@cs.wustl.edu>
 
-	* orbsvcs/tests/AVStreams/Simple/ftp.h:
-	* orbsvcs/tests/AVStreams/Simple/ftp.cpp:
+        * orbsvcs/tests/AVStreams/Simple/ftp.h:
+        * orbsvcs/tests/AVStreams/Simple/ftp.cpp:
 
-	  Removed unused client callbacks. Replaced char* with ACE_CString.
+          Removed unused client callbacks. Replaced char* with ACE_CString.
 
 Mon Mar  5 14:21:15 2001  Priyanka Gontla  <pgontla@ece.uci.edu>
 
-	* tests/Strategies/server.cpp :
-	  Added ACE_TRY_ENV parameter to resolve_initial_references call.
+        * tests/Strategies/server.cpp :
+          Added ACE_TRY_ENV parameter to resolve_initial_references call.
 
 Mon Mar  5 14:21:05 2001  Jeff Parsons <parsons@cs.wustl.edu>
 
diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.cpp b/TAO/orbsvcs/tests/Event/lib/Driver.cpp
index b0201c42893..577de4f0565 100644
--- a/TAO/orbsvcs/tests/Event/lib/Driver.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Driver.cpp
@@ -179,7 +179,7 @@ EC_Driver::initialize_orb_and_poa (int &argc, char* argv[],
 
   CORBA::Object_var poa_object =
     this->orb_->resolve_initial_references("RootPOA", ACE_TRY_ENV);
-  ACE_TRY_CHECK;
+  ACE_CHECK;
 
   if (CORBA::is_nil (poa_object.in ()))
     {
diff --git a/TAO/tests/AMI/client.cpp b/TAO/tests/AMI/client.cpp
index 68d94269454..56aafb30d97 100644
--- a/TAO/tests/AMI/client.cpp
+++ b/TAO/tests/AMI/client.cpp
@@ -107,7 +107,7 @@ public:
         {
           ACE_DEBUG ((LM_DEBUG,
                       "(%P | %t) : Callback method called: result <%d>, out_arg <%d>\n",
-                      result, 
+                      result,
                       out_l));
         }
 
@@ -135,7 +135,7 @@ public:
       ACE_CHECK;
     };
 
-  void get_yadda (CORBA::Long result, 
+  void get_yadda (CORBA::Long result,
                   CORBA::Environment &ACE_TRY_ENV)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
@@ -155,7 +155,7 @@ public:
       ACE_DEBUG ((LM_DEBUG,
                   "Callback method <get_yadda_excep> called: \n"));
     };
-    
+
   void set_yadda (CORBA::Environment &ACE_TRY_ENV)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
@@ -208,7 +208,7 @@ main (int argc, char *argv[])
         }
 
       // Activate POA to handle the call back.
-      
+
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
       ACE_TRY_CHECK;
@@ -217,7 +217,7 @@ main (int argc, char *argv[])
         ACE_ERROR_RETURN ((LM_ERROR,
                            " (%P|%t) Unable to initialize the POA.\n"),
                           1);
-      
+
       PortableServer::POA_var root_poa =
         PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
       ACE_TRY_CHECK;
@@ -228,7 +228,7 @@ main (int argc, char *argv[])
 
       poa_manager->activate (ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      
+
       Client client (server.in (), niterations);
       if (client.activate (THR_NEW_LWP | THR_JOINABLE,
                            nthreads) != 0)
@@ -236,7 +236,7 @@ main (int argc, char *argv[])
                            "Cannot activate client threads\n"),
                           1);
 
-      // Main thread collects replies. It needs to collect 
+      // Main thread collects replies. It needs to collect
       // <nthreads*niterations> replies.
       number_of_replies = nthreads * niterations;
 
@@ -246,7 +246,7 @@ main (int argc, char *argv[])
                       "(%P|%t) : Entering perform_work loop to receive <%d> replies\n",
                       number_of_replies));
         }
-      
+
       // ORB loop.
       while (orb->work_pending (ACE_TRY_ENV) && number_of_replies > 0)
         {
@@ -278,7 +278,6 @@ main (int argc, char *argv[])
       return 1;
     }
   ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/tests/AMI/server.cpp b/TAO/tests/AMI/server.cpp
index 01d3adf7961..c1a04088a1f 100644
--- a/TAO/tests/AMI/server.cpp
+++ b/TAO/tests/AMI/server.cpp
@@ -121,7 +121,6 @@ main (int argc, char *argv[])
       return 1;
     }
   ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }