1 files changed, 20 insertions, 25 deletions

diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp b/TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp
index 9be44b25f7c..baf1fb58ed1 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp
+++ b/TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp
@@ -9,7 +9,7 @@
 //    server_A.cpp
 //
 // = DESCRIPTION
-//    This class implements a simple server for the
+//    This class implements a simple server for the 
 //    Nested Upcalls - Triangle test.
 //
 // = AUTHORS
@@ -63,16 +63,16 @@ Object_A_Server::parse_args (void)
 int
 Object_A_Server::init (int argc,
                        char** argv,
-                       CORBA::Environment& ACE_TRY_ENV)
+                       CORBA::Environment& env)
 {
   // Call the init of TAO_ORB_Manager to create a child POA
   // under the root POA.
   this->orb_manager_.init_child_poa (argc,
                                      argv,
                                      "child_poa",
-                                     ACE_TRY_ENV);
+                                     env);
 
-  ACE_CHECK_RETURN (-1);
+  TAO_CHECK_ENV_RETURN (env,-1);
   this->argc_ = argc;
   this->argv_ = argv;
 
@@ -82,9 +82,7 @@ Object_A_Server::init (int argc,
   CORBA::String_var str  =
     this->orb_manager_.activate_under_child_poa ("object_A",
                                                  &this->object_A_i_,
-                                                 ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
+                                                 env);
   ACE_DEBUG ((LM_DEBUG,
               "The IOR is: <%s>\n",
               str.in ()));
@@ -103,17 +101,14 @@ Object_A_Server::init (int argc,
 
 
 int
-Object_A_Server::run (CORBA::Environment& ACE_TRY_ENV)
+Object_A_Server::run (CORBA::Environment& env)
 {
-  int r = this->orb_manager_.run (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
-  if (r == -1)
+  if (this->orb_manager_.run (env) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "NestedUpCalls_Server::run"),
                       -1);
-  return 0;}
-
+  return 0;
+}
 
 Object_A_Server::~Object_A_Server (void)
 {
@@ -126,28 +121,28 @@ main (int argc, char *argv[])
 
   ACE_DEBUG ((LM_DEBUG,
               "\n \t NestedUpCalls.Triangle_Test: Object A Server \n \n"));
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
-      if (object_A_Server.init (argc,argv, ACE_TRY_ENV) == -1)
+      if (object_A_Server.init (argc,argv,TAO_TRY_ENV) == -1)
         return 1;
       else
         {
-          object_A_Server.run (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          object_A_Server.run (TAO_TRY_ENV);
+          TAO_CHECK_ENV;
         }
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  TAO_CATCH (CORBA::SystemException, sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex, "System Exception");
+      ACE_UNUSED_ARG (sysex);
+      TAO_TRY_ENV.print_exception ("System Exception");
       return -1;
     }
-  ACE_CATCH (CORBA::UserException, userex)
+  TAO_CATCH (CORBA::UserException, userex)
     {
-      ACE_PRINT_EXCEPTION (userex, "User Exception");
+      ACE_UNUSED_ARG (userex);
+      TAO_TRY_ENV.print_exception ("User Exception");
       return -1;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
   return 0;
 }