4 files changed, 36 insertions, 42 deletions

diff --git a/TAO/orbsvcs/tests/ImplRepo/scale/client.cpp b/TAO/orbsvcs/tests/ImplRepo/scale/client.cpp
index 38766d2d780..e643162f41b 100644
--- a/TAO/orbsvcs/tests/ImplRepo/scale/client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/scale/client.cpp
@@ -9,13 +9,13 @@ using namespace CORBA;
 
 int main(int argc, char* argv[]) {
 
-  ACE_TRY_NEW_ENV
+  try
   {
 
-    ORB_var orb = ORB_init(argc, argv, 0 ACE_ENV_ARG_PARAMETER);
+    ORB_var orb = ORB_init(argc, argv, 0);
 
-    Object_var obj = orb->resolve_initial_references("Test" ACE_ENV_ARG_PARAMETER);
-    test_var test = test::_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
+    Object_var obj = orb->resolve_initial_references("Test");
+    test_var test = test::_narrow(obj.in());
     ACE_ASSERT(! is_nil(test.in()));
 
     Long n = test->get();
@@ -27,10 +27,9 @@ int main(int argc, char* argv[]) {
 
     return 0;
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "client:");
+    ex._tao_print_exception ("client:");
   }
-  ACE_ENDTRY;
   return -1;
 }
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;
 }
diff --git a/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp
index 622fec14c14..8994cabe3ed 100644
--- a/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp
@@ -25,8 +25,8 @@ public:
   }
   virtual CORBA::Long get (void) ACE_THROW_SPEC ((CORBA::SystemException)) {
     ++n_;
-    CORBA::Object_var obj = orb_->resolve_initial_references("POACurrent" ACE_ENV_ARG_PARAMETER);
-    PortableServer::Current_var cur = PortableServer::Current::_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
+    CORBA::Object_var obj = orb_->resolve_initial_references("POACurrent");
+    PortableServer::Current_var cur = PortableServer::Current::_narrow(obj.in());
     ACE_ASSERT(! CORBA::is_nil(cur.in()));
     PortableServer::POA_var poa = cur->get_POA();
     CORBA::String_var poaname = poa->the_name();
@@ -91,36 +91,36 @@ namespace
 }
 
 int
-Server_i::init (int argc, char** argv ACE_ENV_ARG_DECL)
+Server_i::init (int argc, char** argv)
 {
-  ACE_TRY
+  try
   {
-    this->orb_ = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER);
+    this->orb_ = CORBA::ORB_init (argc, argv, 0);
 
     int retval = this->parse_args (argc, argv);
     if (retval != 0)
       return retval;
 
     CORBA::Object_var obj =
-      this->orb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
+      this->orb_->resolve_initial_references ("RootPOA");
     this->root_poa_ =
-      PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
+      PortableServer::POA::_narrow (obj.in ());
     ACE_ASSERT(! CORBA::is_nil(this->root_poa_.in()));
 
     PortableServer::POAManager_var poa_manager =
       this->root_poa_->the_POAManager ();
 
-    obj = this->orb_->resolve_initial_references ("IORTable" ACE_ENV_ARG_PARAMETER);
+    obj = this->orb_->resolve_initial_references ("IORTable");
     IORTable::Table_var ior_table =
-      IORTable::Table::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
+      IORTable::Table::_narrow (obj.in ());
     ACE_ASSERT(! CORBA::is_nil(ior_table.in()));
 
     // If -orbuseimr 1 is specified then all persistent poas will be
     // registered with the imr.
     CORBA::PolicyList policies (2);
     policies.length (2);
-    policies[0] = this->root_poa_->create_id_assignment_policy (PortableServer::USER_ID ACE_ENV_ARG_PARAMETER);
-    policies[1] = this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT ACE_ENV_ARG_PARAMETER);
+    policies[0] = this->root_poa_->create_id_assignment_policy (PortableServer::USER_ID);
+    policies[1] = this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT);
 
     test_i* test_svt;
     ACE_NEW_RETURN (test_svt, test_i(orb_.in()), -1);
@@ -138,28 +138,26 @@ Server_i::init (int argc, char** argv ACE_ENV_ARG_DECL)
       PortableServer::POA_var poa =
         this->root_poa_->create_POA (name.c_str(),
         poa_manager.in (),
-        policies
-        ACE_ENV_ARG_PARAMETER);
+        policies);
 
-      poa->activate_object_with_id (server_id.in (), test_svt ACE_ENV_ARG_PARAMETER);
+      poa->activate_object_with_id (server_id.in (), test_svt);
 
       TAO_Root_POA* tmp_poa = dynamic_cast<TAO_Root_POA*>(poa.in());
-      obj = tmp_poa->id_to_reference_i (server_id.in (), false ACE_ENV_ARG_PARAMETER);
+      obj = tmp_poa->id_to_reference_i (server_id.in (), false);
 
-      CORBA::String_var ior = this->orb_->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER);
+      CORBA::String_var ior = this->orb_->object_to_string (obj.in ());
 
-      ior_table->bind (name.c_str(), ior.in () ACE_ENV_ARG_PARAMETER);
+      ior_table->bind (name.c_str(), ior.in ());
     }
 
     policies[0]->destroy();
     policies[1]->destroy();
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Server_i::init");
-    ACE_RE_THROW;
+    ex._tao_print_exception ("Server_i::init");
+    throw;
   }
-  ACE_ENDTRY;
 
 
   return 0;
@@ -168,7 +166,7 @@ Server_i::init (int argc, char** argv ACE_ENV_ARG_DECL)
 int
 Server_i::run (void)
 {
-  ACE_TRY
+  try
   {
     PortableServer::POAManager_var poa_manager =
       this->root_poa_->the_POAManager ();
@@ -193,12 +191,11 @@ Server_i::run (void)
     this->root_poa_->destroy(1, 1);
     this->orb_->destroy();
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Server_i::run");
-    ACE_RE_THROW;
+    ex._tao_print_exception ("Server_i::run");
+    throw;
   }
-  ACE_ENDTRY;
 
 
   return 0;
diff --git a/TAO/orbsvcs/tests/ImplRepo/scale/server_i.h b/TAO/orbsvcs/tests/ImplRepo/scale/server_i.h
index 8e947b72b69..24d8dc97c8d 100644
--- a/TAO/orbsvcs/tests/ImplRepo/scale/server_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/scale/server_i.h
@@ -15,7 +15,7 @@ public:
   Server_i (void);
   ~Server_i (void);
 
-  int init (int argc, char **argv ACE_ENV_ARG_DECL);
+  int init (int argc, char **argv);
 
   int run (void);