1 files changed, 10 insertions, 17 deletions

diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp
index cc5e240ab3a..dcf671e5fcb 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp
@@ -40,7 +40,7 @@ TAO_Concurrency_Server::init (CORBA::ORB_ptr orb,
 {
   CORBA::Object_var obj;
 
-  ACE_TRY_NEW_ENV
+  try
     {
       // @@ Huh?!?
 
@@ -52,31 +52,27 @@ TAO_Concurrency_Server::init (CORBA::ORB_ptr orb,
         PortableServer::string_to_ObjectId ("ConcurrencyService");
 
       poa->activate_object_with_id (id.in (),
-                                    &this->lock_set_factory_
-                                    ACE_ENV_ARG_PARAMETER);
+                                    &this->lock_set_factory_);
 
       // Stringify the objref we'll be implementing, and print it to
       // stdout.  Someone will take that string and give it to a
       // client.  Then release the object.
       obj =
-        poa->id_to_reference (id.in ()
-                              ACE_ENV_ARG_PARAMETER);
+        poa->id_to_reference (id.in ());
 
       CORBA::String_var str =
-        orb->object_to_string (obj.in ()
-                               ACE_ENV_ARG_PARAMETER);
+        orb->object_to_string (obj.in ());
 
       ACE_DEBUG ((LM_DEBUG,
                   "listening as object <%s>\n",
                   str.in ()));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+      ACE_PRINT_EXCEPTION (ex,
                            "Concurrency Service");
       return CORBA::Object::_nil ();
     }
-  ACE_ENDTRY;
 
   return obj._retn ();
 }
@@ -84,26 +80,23 @@ TAO_Concurrency_Server::init (CORBA::ORB_ptr orb,
 int
 TAO_Concurrency_Server::fini (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       PortableServer::ObjectId_var id =
         this->poa_->servant_to_id (&this->lock_set_factory_);
 
-      this->poa_->deactivate_object (id.in ()
-                                     ACE_ENV_ARG_PARAMETER);
+      this->poa_->deactivate_object (id.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       if (TAO_debug_level > 0)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+          ACE_PRINT_EXCEPTION (ex,
                                ACE_TEXT ("TAO_Concurrency_Server"));
         }
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }