1 files changed, 6 insertions, 8 deletions
diff --git a/TAO/orbsvcs/tests/ImplRepo/scale/server.cpp b/TAO/orbsvcs/tests/ImplRepo/scale/server.cpp
index c18c843e2d1..feb6d972b2e 100644
--- a/TAO/orbsvcs/tests/ImplRepo/scale/server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/scale/server.cpp
@@ -5,12 +5,11 @@
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       Server_i server;
 
-      int retval = server.init (argc, argv ACE_ENV_ARG_PARAMETER);
+      int retval = server.init (argc, argv);
 
       if (retval == -1)
         return -1;
@@ -19,17 +18,16 @@ main (int argc, char *argv[])
           server.run ();
         }
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (const CORBA::SystemException& sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex, "Server: System Exception");
+      sysex._tao_print_exception ("Server: System Exception");
       return -1;
     }
-  ACE_CATCH (CORBA::UserException, userex)
+  catch (const CORBA::UserException& userex)
     {
-      ACE_PRINT_EXCEPTION (userex, "Server: User Exception");
+      userex._tao_print_exception ("Server: User Exception");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }