Merged corba-env-clean branch.

1 files changed, 79 insertions, 79 deletions

diff --git a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp
index 953eaef95ee..aa1f028eb1a 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp
@@ -45,8 +45,8 @@ ImplRepo_i::ImplRepo_i (void)
 }
 
 char *
-ImplRepo_i::find_ior (const ACE_CString &object_name,
-                      CORBA::Environment &ACE_TRY_ENV)
+ImplRepo_i::find_ior (const ACE_CString &object_name
+                      TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException, IORTable::NotFound))
 {
   ACE_TString endpoint;
@@ -67,8 +67,8 @@ ImplRepo_i::find_ior (const ACE_CString &object_name,
 
   ACE_TRY
     {
-      endpoint = this->activate_server_i (poa_name.c_str (), 1,
-                                          ACE_TRY_ENV);
+      endpoint = this->activate_server_i (poa_name.c_str (), 1
+                                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -96,22 +96,22 @@ ImplRepo_i::find_ior (const ACE_CString &object_name,
 // not already started and if it can be started.
 
 void
-ImplRepo_i::activate_server (const char *server,
-                             CORBA::Environment &ACE_TRY_ENV)
+ImplRepo_i::activate_server (const char *server
+                             TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      ImplementationRepository::Administration::NotFound,
                      ImplementationRepository::Administration::CannotActivate))
 {
   // Since this is called through the Admin interface, we should ignore some
   // of the activation modes.  Also ignore the return value.
-  this->activate_server_i (server, 0, ACE_TRY_ENV);
+  this->activate_server_i (server, 0 TAO_ENV_ARG_PARAMETER);
 }
 
 
 ACE_TString
 ImplRepo_i::activate_server_i (const char *server,
-                               const int check_startup,
-                               CORBA::Environment &ACE_TRY_ENV)
+                               const int check_startup
+                               TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      ImplementationRepository::Administration::NotFound,
                      ImplementationRepository::Administration::CannotActivate))
@@ -158,11 +158,11 @@ ImplRepo_i::activate_server_i (const char *server,
       ACE_TRY
         {
           CORBA::Object_var object =
-            orb->string_to_object (server_object_ior.c_str (), ACE_TRY_ENV);
+            orb->string_to_object (server_object_ior.c_str () TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ImplementationRepository::ServerObject_var server_object =
-            ImplementationRepository::ServerObject::_narrow (object.in (), ACE_TRY_ENV);
+            ImplementationRepository::ServerObject::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (CORBA::is_nil (server_object.in ()))
@@ -174,7 +174,7 @@ ImplRepo_i::activate_server_i (const char *server,
             }
 
           // Check to see if we can ping it
-          server_object->ping (ACE_TRY_ENV);
+          server_object->ping (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
@@ -228,8 +228,8 @@ ImplRepo_i::activate_server_i (const char *server,
 // Starts the server process
 
 void
-ImplRepo_i::start_server_i (const char *server,
-                            CORBA::Environment &ACE_TRY_ENV)
+ImplRepo_i::start_server_i (const char *server
+                            TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      ImplementationRepository::Administration::NotFound,
                      ImplementationRepository::Administration::CannotActivate))
@@ -399,7 +399,7 @@ ImplRepo_i::ready_check (const char *server)
   ACE_TString ping_object_ior, location;
   ImplementationRepository::ServerObject_var ping_object;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   // <end> is the end of the window where we can get a response before
   // timing out
@@ -428,12 +428,12 @@ ImplRepo_i::ready_check (const char *server)
   ACE_TRY_EX (ping1)
     {
       CORBA::Object_var object =
-        orb->string_to_object (ping_object_ior.c_str (), ACE_TRY_ENV);
+        orb->string_to_object (ping_object_ior.c_str () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK_EX (ping1);
 
       ping_object =
-        ImplementationRepository::ServerObject::_narrow (object.in (),
-                                                         ACE_TRY_ENV);
+        ImplementationRepository::ServerObject::_narrow (object.in ()
+                                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK_EX (ping1);
 
       if (CORBA::is_nil (ping_object.in ()))
@@ -471,7 +471,7 @@ ImplRepo_i::ready_check (const char *server)
           if (OPTIONS::instance()->debug () >= 2)
             ACE_DEBUG ((LM_DEBUG, "Pinging Server...\n"));
 
-          ping_object->ping (ACE_TRY_ENV);
+          ping_object->ping (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK_EX (ping2);
 
           if (OPTIONS::instance()->debug () >= 2)
@@ -503,8 +503,8 @@ ImplRepo_i::ready_check (const char *server)
 
 void
 ImplRepo_i::register_server (const char *server,
-                             const ImplementationRepository::StartupOptions &options,
-                             CORBA::Environment &ACE_TRY_ENV)
+                             const ImplementationRepository::StartupOptions &options
+                             TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      ImplementationRepository::Administration::AlreadyRegistered))
 {
@@ -575,8 +575,8 @@ ImplRepo_i::register_server (const char *server,
 
 void
 ImplRepo_i::reregister_server (const char *server,
-                               const ImplementationRepository::StartupOptions &options,
-                               CORBA::Environment &ACE_TRY_ENV)
+                               const ImplementationRepository::StartupOptions &options
+                               TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (OPTIONS::instance ()->readonly ())
@@ -627,8 +627,8 @@ ImplRepo_i::reregister_server (const char *server,
 // Remove the server entry from the Repository
 
 void
-ImplRepo_i::remove_server (const char *server,
-                           CORBA::Environment &ACE_TRY_ENV)
+ImplRepo_i::remove_server (const char *server
+                           TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      ImplementationRepository::Administration::NotFound))
 {
@@ -657,8 +657,8 @@ ImplRepo_i::remove_server (const char *server,
 char *
 ImplRepo_i::server_is_running (const char *server,
                                const char *location,
-                               ImplementationRepository::ServerObject_ptr server_object,
-                               CORBA::Environment &ACE_TRY_ENV)
+                               ImplementationRepository::ServerObject_ptr server_object
+                               TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      ImplementationRepository::Administration::NotFound))
 {
@@ -672,8 +672,8 @@ ImplRepo_i::server_is_running (const char *server,
     ACE_DEBUG ((LM_DEBUG, " at %s\n", location));
 
   // Get the stringified server_object_ior
-  ACE_TCHAR *server_object_ior = orb->object_to_string (server_object,
-                                                        ACE_TRY_ENV);
+  ACE_TCHAR *server_object_ior = orb->object_to_string (server_object
+                                                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (this->repository_.update (server, location, server_object_ior) == 0)
@@ -720,7 +720,7 @@ ImplRepo_i::server_is_running (const char *server,
 
   if (profile)
     {
-      new_location = profile->to_string (ACE_TRY_ENV);
+      new_location = profile->to_string (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
   else
@@ -750,8 +750,8 @@ ImplRepo_i::server_is_running (const char *server,
 // Remove the state information for the current server
 
 void
-ImplRepo_i::server_is_shutting_down (const char *server,
-                                     CORBA::Environment &ACE_TRY_ENV)
+ImplRepo_i::server_is_shutting_down (const char *server
+                                     TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      ImplementationRepository::Administration::NotFound))
 {
@@ -774,18 +774,18 @@ ImplRepo_i::server_is_shutting_down (const char *server,
 
 
 int
-ImplRepo_i::init (CORBA::Environment &ACE_TRY_ENV)
+ImplRepo_i::init (TAO_ENV_SINGLE_ARG_DECL)
 {
   CORBA::ORB_var orb = OPTIONS::instance ()->orb ();
 
   ACE_TRY
     {
       CORBA::Object_var table_object =
-        orb->resolve_initial_references ("IORTable", ACE_TRY_ENV);
+        orb->resolve_initial_references ("IORTable" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       IORTable::Table_var adapter =
-        IORTable::Table::_narrow (table_object.in (), ACE_TRY_ENV);
+        IORTable::Table::_narrow (table_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (CORBA::is_nil (adapter.in ()))
         {
@@ -793,12 +793,12 @@ ImplRepo_i::init (CORBA::Environment &ACE_TRY_ENV)
         }
       else
         {
-          adapter->set_locator (this->locator_.in (), ACE_TRY_ENV);
+          adapter->set_locator (this->locator_.in () TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
       CORBA::Object_var root_poa_object =
-        orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (root_poa_object.in ()))
@@ -807,12 +807,12 @@ ImplRepo_i::init (CORBA::Environment &ACE_TRY_ENV)
                           -1);
 
       // Get the POA object.
-      this->root_poa_ = PortableServer::POA::_narrow (root_poa_object.in (),
-                                                      ACE_TRY_ENV);
+      this->root_poa_ = PortableServer::POA::_narrow (root_poa_object.in ()
+                                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        this->root_poa_->the_POAManager (ACE_TRY_ENV);
+        this->root_poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::PolicyList policies (2);
@@ -820,21 +820,21 @@ ImplRepo_i::init (CORBA::Environment &ACE_TRY_ENV)
 
       // Id Assignment policy
       policies[0] =
-        this->root_poa_->create_id_assignment_policy (PortableServer::USER_ID,
-                                                      ACE_TRY_ENV);
+        this->root_poa_->create_id_assignment_policy (PortableServer::USER_ID
+                                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Lifespan policy
       policies[1] =
-        this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT,
-                                                 ACE_TRY_ENV);
+        this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT
+                                                 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->imr_poa_ =
         this->root_poa_->create_POA ("ImplRepoService",
                                      poa_manager.in (),
-                                     policies,
-                                     ACE_TRY_ENV);
+                                     policies
+                                     TAO_ENV_ARG_PARAMETER);
 
       // Warning!  If create_POA fails, then the policies won't be
       // destroyed and there will be hell to pay in memory leaks!
@@ -844,7 +844,7 @@ ImplRepo_i::init (CORBA::Environment &ACE_TRY_ENV)
       for (CORBA::ULong i = 0; i < policies.length (); ++i)
         {
           CORBA::Policy_ptr policy = policies[i];
-          policy->destroy (ACE_TRY_ENV);
+          policy->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -856,24 +856,24 @@ ImplRepo_i::init (CORBA::Environment &ACE_TRY_ENV)
         PortableServer::string_to_ObjectId ("ImplRepoService");
 
       this->imr_poa_->activate_object_with_id (imr_id.in (),
-                                               this,
-                                               ACE_TRY_ENV);
+                                               this
+                                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the IMR object
       CORBA::Object_var imr_obj =
-        this->imr_poa_->id_to_reference (imr_id.in (), ACE_TRY_ENV);
+        this->imr_poa_->id_to_reference (imr_id.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // And its string
 
       this->imr_ior_ =
-        orb->object_to_string (imr_obj.in (), ACE_TRY_ENV);
+        orb->object_to_string (imr_obj.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Register with INS.
-      adapter->bind ("ImplRepoService", this->imr_ior_.in (),
-                     ACE_TRY_ENV);
+      adapter->bind ("ImplRepoService", this->imr_ior_.in ()
+                     TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (OPTIONS::instance ()->debug () >= 2)
@@ -896,7 +896,7 @@ ImplRepo_i::init (CORBA::Environment &ACE_TRY_ENV)
       // Register the Adapter_Activator reference to be the RootPOA's
       // Adapter Activator.
 
-      this->root_poa_->the_activator (this->activator_, ACE_TRY_ENV);
+      this->root_poa_->the_activator (this->activator_ TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get reactor instance from TAO.
@@ -1025,18 +1025,18 @@ ImplRepo_i::setup_multicast (ACE_Reactor *reactor)
 
 
 int
-ImplRepo_i::fini (CORBA::Environment &ACE_TRY_ENV)
+ImplRepo_i::fini (TAO_ENV_SINGLE_ARG_DECL)
 {
   CORBA::ORB_var orb = OPTIONS::instance ()->orb ();
 
   ACE_TRY
     {
       CORBA::Object_var table_object =
-        orb->resolve_initial_references ("IORTable", ACE_TRY_ENV);
+        orb->resolve_initial_references ("IORTable" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       IORTable::Table_var adapter =
-        IORTable::Table::_narrow (table_object.in (), ACE_TRY_ENV);
+        IORTable::Table::_narrow (table_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (CORBA::is_nil (adapter.in ()))
         {
@@ -1044,15 +1044,15 @@ ImplRepo_i::fini (CORBA::Environment &ACE_TRY_ENV)
         }
       else
         {
-          adapter->set_locator (IORTable::Locator::_nil (),
-                                ACE_TRY_ENV);
+          adapter->set_locator (IORTable::Locator::_nil ()
+                                TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
-      this->imr_poa_->destroy (1, 1, ACE_TRY_ENV);
+      this->imr_poa_->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      this->root_poa_->destroy (1, 1, ACE_TRY_ENV);
+      this->root_poa_->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -1066,13 +1066,13 @@ ImplRepo_i::fini (CORBA::Environment &ACE_TRY_ENV)
 }
 
 int
-ImplRepo_i::run (CORBA::Environment &ACE_TRY_ENV)
+ImplRepo_i::run (TAO_ENV_SINGLE_ARG_DECL)
 {
   CORBA::ORB_var orb = OPTIONS::instance ()->orb ();
 
   PortableServer::POAManager_var poa_manager =
-    this->imr_poa_->the_POAManager (ACE_TRY_ENV);
-  poa_manager->activate (ACE_TRY_ENV);
+    this->imr_poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+  poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Get a new iterator
@@ -1107,8 +1107,8 @@ ImplRepo_i::run (CORBA::Environment &ACE_TRY_ENV)
       ACE_TRY
         {
           if (activation == ImplementationRepository::AUTO_START)
-            this->activate_server (server_entry->ext_id_.c_str (),
-                                   ACE_TRY_ENV);
+            this->activate_server (server_entry->ext_id_.c_str ()
+                                   TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
@@ -1126,7 +1126,7 @@ ImplRepo_i::run (CORBA::Environment &ACE_TRY_ENV)
     }
 
 
-  orb->run (0, ACE_TRY_ENV);
+  orb->run (0 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
@@ -1157,8 +1157,8 @@ ImplRepo_i::~ImplRepo_i (void)
 
 void
 ImplRepo_i::find (const char *server,
-                  ImplementationRepository::ServerInformation_out info,
-                  CORBA::Environment &ACE_TRY_ENV)
+                  ImplementationRepository::ServerInformation_out info
+                  TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    ImplementationRepository::Administration::NotFound))
 {
@@ -1201,8 +1201,8 @@ ImplRepo_i::find (const char *server,
 void
 ImplRepo_i::list (CORBA::ULong how_many,
                   ImplementationRepository::ServerInformationList_out server_list,
-                  ImplementationRepository::ServerInformationIterator_out server_iterator,
-                  CORBA::Environment &ACE_TRY_ENV)
+                  ImplementationRepository::ServerInformationIterator_out server_iterator
+                  TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Initialize the out variables, so if we return early, they will
@@ -1285,9 +1285,9 @@ ImplRepo_i::list (CORBA::ULong how_many,
       ACE_TRY
         {
           PortableServer::ObjectId_var id =
-            this->root_poa_->activate_object (imr_iter, ACE_TRY_ENV);
+            this->root_poa_->activate_object (imr_iter TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          server_iterator = imr_iter->_this (ACE_TRY_ENV);
+          server_iterator = imr_iter->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
@@ -1305,8 +1305,8 @@ ImplRepo_i::list (CORBA::ULong how_many,
  * to do it ungracefully.
  */
 void
-ImplRepo_i::shutdown_server (const char *server,
-                             CORBA::Environment &ACE_TRY_ENV)
+ImplRepo_i::shutdown_server (const char *server
+                             TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    ImplementationRepository::Administration::NotFound))
 {
@@ -1332,12 +1332,12 @@ ImplRepo_i::shutdown_server (const char *server,
       ACE_TRY
         {
           CORBA::Object_var object =
-            orb->string_to_object (server_object_ior.c_str (), ACE_TRY_ENV);
+            orb->string_to_object (server_object_ior.c_str () TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ImplementationRepository::ServerObject_var server_object =
-            ImplementationRepository::ServerObject::_narrow (object.in (),
-                                                             ACE_TRY_ENV);
+            ImplementationRepository::ServerObject::_narrow (object.in ()
+                                                             TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (CORBA::is_nil (server_object.in ()))
@@ -1349,7 +1349,7 @@ ImplRepo_i::shutdown_server (const char *server,
             }
 
           // Call shutdown
-          server_object->shutdown (ACE_TRY_ENV);
+          server_object->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // Remove running info from repository