1 files changed, 18 insertions, 18 deletions

diff --git a/TAO/tao/PortableServer/Object_Adapter.i b/TAO/tao/PortableServer/Object_Adapter.i
index 5c9803645a0..677799cc3ae 100644
--- a/TAO/tao/PortableServer/Object_Adapter.i
+++ b/TAO/tao/PortableServer/Object_Adapter.i
@@ -44,37 +44,37 @@ TAO_Object_Adapter::transient_poa_name_size ()
 }
 
 ACE_INLINE int
-TAO_Object_Adapter::locate_servant (const TAO_ObjectKey &key,
-                                    CORBA::Environment &ACE_TRY_ENV)
+TAO_Object_Adapter::locate_servant (const TAO_ObjectKey &key
+                                    TAO_ENV_ARG_DECL)
 {
   // Lock access for the duration of this transaction.
   TAO_OBJECT_ADAPTER_GUARD_RETURN (-1);
 
-  return this->locate_servant_i (key,
-                                 ACE_TRY_ENV);
+  return this->locate_servant_i (key
+                                 TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE TAO_SERVANT_LOCATION
 TAO_Object_Adapter::find_servant (const TAO_ObjectKey &key,
-                                  PortableServer::Servant &servant,
-                                  CORBA::Environment &ACE_TRY_ENV)
+                                  PortableServer::Servant &servant
+                                  TAO_ENV_ARG_DECL)
 {
   // Lock access for the duration of this transaction.
   TAO_OBJECT_ADAPTER_GUARD_RETURN (TAO_SERVANT_NOT_FOUND);
 
   return this->find_servant_i (key,
-                               servant,
-                               ACE_TRY_ENV);
+                               servant
+                               TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE int
 TAO_Object_Adapter::find_persistent_poa (const poa_name &system_name,
-                                         TAO_POA *&poa,
-                                         CORBA_Environment &ACE_TRY_ENV)
+                                         TAO_POA *&poa
+                                         TAO_ENV_ARG_DECL)
 {
   return this->hint_strategy_->find_persistent_poa (system_name,
-                                                    poa,
-                                                    ACE_TRY_ENV);
+                                                    poa
+                                                    TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE int
@@ -82,22 +82,22 @@ TAO_Object_Adapter::find_poa (const poa_name &system_name,
                               CORBA::Boolean activate_it,
                               CORBA::Boolean root,
                               const TAO_Temporary_Creation_Time &poa_creation_time,
-                              TAO_POA *&poa,
-                              CORBA_Environment &ACE_TRY_ENV)
+                              TAO_POA *&poa
+                              TAO_ENV_ARG_DECL)
 {
   if (activate_it)
     {
       return this->find_persistent_poa (system_name,
-                                        poa,
-                                        ACE_TRY_ENV);
+                                        poa
+                                        TAO_ENV_ARG_PARAMETER);
     }
   else
     {
       return this->find_transient_poa (system_name,
                                        root,
                                        poa_creation_time,
-                                       poa,
-                                       ACE_TRY_ENV);
+                                       poa
+                                       TAO_ENV_ARG_PARAMETER);
     }
 }