1 files changed, 41 insertions, 64 deletions

diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.cpp
index f291baacad4..a889a00c118 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.cpp
@@ -30,101 +30,87 @@ ServerApp::~ServerApp()
 
 
 int
-ServerApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL)
+ServerApp::run_i(int argc, char* argv[])
 {
-  int result = this->init(argc, argv ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  int result = this->init(argc, argv);
   if (result != 0)
     {
       return result;
     }
-  
-  this->poa_setup(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  this->csd_setup(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  this->servant_setup(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+
+  this->poa_setup();
+  this->csd_setup();
+  this->servant_setup();
   this->collocated_setup();
-  this->poa_activate(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  this->run_collocated_clients(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  this->run_orb_event_loop(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->poa_activate();
+  this->run_collocated_clients();
+  this->run_orb_event_loop();
 
   // Calling wait on ACE_Thread_Manager singleton to avoid the problem
   // that the main thread might exit before all CSD Threads exit.
 
   // Wait for all CSD task threads exit.
   ACE_Thread_Manager::instance ()->wait ();
-  
+
   this->cleanup();
   return this->check_validity () ? 0 : -1;
 }
 
 
 int
-ServerApp::init(int argc, char* argv[] ACE_ENV_ARG_DECL)
+ServerApp::init(int argc, char* argv[])
 {
-  this->orb_ = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->orb_ = CORBA::ORB_init(argc, argv, "");
 
   // Parse the command-line args for this application.
   // * Raises -1 if problems are encountered.
   // * Returns 1 if the usage statement was explicitly requested.
   // * Returns 0 otherwise.
   int result = this->parse_args(argc, argv);
-  
+
   if (result != 0)
     {
       return result;
     }
-  
+
   unsigned num_clients = this->num_remote_clients_ +
                          this->num_collocated_clients_;
 
-  TheAppShutdown->init (this->orb_.in (), num_clients ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  TheAppShutdown->init (this->orb_.in (), num_clients);
 
   return 0;
 }
 
 
 void
-ServerApp::poa_setup(ACE_ENV_SINGLE_ARG_DECL)
+ServerApp::poa_setup(void)
 {
-  this->poa_ = this->create_poa(this->orb_.in(), 
-                                "ChildPoa" 
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->poa_ = this->create_poa(this->orb_.in(),
+                                "ChildPoa");
 }
 
 
 void
-ServerApp::csd_setup(ACE_ENV_SINGLE_ARG_DECL)
+ServerApp::csd_setup(void)
 {
   this->tp_strategy_ = new TAO::CSD::TP_Strategy(this->num_csd_threads_);
 
-  if (!this->tp_strategy_->apply_to(this->poa_.in() ACE_ENV_ARG_PARAMETER))
+  if (!this->tp_strategy_->apply_to(this->poa_.in()))
     {
       ACE_ERROR((LM_ERROR,
                  "Failed to apply CSD strategy to poa.\n"));
-      ACE_THROW(TestAppException());
+      throw TestAppException();
     }
-  ACE_CHECK;
 }
 
 
 void
-ServerApp::servant_setup(ACE_ENV_SINGLE_ARG_DECL)
+ServerApp::servant_setup(void)
 {
   this->servants_.create_and_activate(this->num_servants_,
                                       this->orb_.in (),
                                       this->poa_.in (),
-                                      this->ior_filename_prefix_.c_str()
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                      this->ior_filename_prefix_.c_str());
 }
 
 
@@ -145,36 +131,33 @@ ServerApp::collocated_setup()
 
 
 void
-ServerApp::poa_activate(ACE_ENV_SINGLE_ARG_DECL)
+ServerApp::poa_activate(void)
 {
-  PortableServer::POAManager_var poa_manager 
-    = this->poa_->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  PortableServer::POAManager_var poa_manager
+    = this->poa_->the_POAManager();
 
-  poa_manager->activate(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  poa_manager->activate();
 }
 
 
 void
-ServerApp::run_collocated_clients(ACE_ENV_SINGLE_ARG_DECL)
+ServerApp::run_collocated_clients(void)
 {
   if (this->num_collocated_clients_ > 0)
     {
       if (this->collocated_client_task_.open() == -1)
         {
-          ACE_THROW (TestAppException ());
+          throw TestAppException ();
         }
     }
 }
 
 
 void
-ServerApp::run_orb_event_loop(ACE_ENV_SINGLE_ARG_DECL)
+ServerApp::run_orb_event_loop(void)
 {
   OrbRunner orb_runner(this->orb_.in(), this->num_orb_threads_);
-  orb_runner.run(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  orb_runner.run();
   TheAppShutdown->wait ();
 }
 
@@ -287,7 +270,7 @@ ServerApp::usage_statement()
 int
 ServerApp::arg_dependency_checks()
 {
-  return (this->num_remote_clients_ 
+  return (this->num_remote_clients_
          + this->num_collocated_clients_) > 0 ? 0 : -1;
 }
 
@@ -316,21 +299,17 @@ ServerApp::set_arg(unsigned&   value,
 
 
 PortableServer::POA_ptr
-ServerApp::create_poa(CORBA::ORB_ptr orb, 
-                      const char* poa_name
-                      ACE_ENV_ARG_DECL)
+ServerApp::create_poa(CORBA::ORB_ptr orb,
+                      const char* poa_name)
 {
   // Get the Root POA.
   PortableServer::POA_var root_poa
-    = RefHelper<PortableServer::POA>::resolve_initial_ref(orb, 
-                                                          "RootPOA"
-                                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
+    = RefHelper<PortableServer::POA>::resolve_initial_ref(orb,
+                                                          "RootPOA");
 
   // Get the POAManager from the Root POA.
-  PortableServer::POAManager_var poa_manager 
-    = root_poa->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
+  PortableServer::POAManager_var poa_manager
+    = root_poa->the_POAManager();
 
   // Create the child POA Policies.
   CORBA::PolicyList policies(0);
@@ -340,9 +319,7 @@ ServerApp::create_poa(CORBA::ORB_ptr orb,
   PortableServer::POA_var poa = AppHelper::create_poa(poa_name,
                                                       root_poa.in(),
                                                       poa_manager.in(),
-                                                      policies
-                                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
+                                                      policies);
 
   // Give away the child POA_ptr from the POA_var variable.
   return poa._retn();
@@ -353,7 +330,7 @@ bool
 ServerApp::check_validity ()
 {
   // Check whether the clients return any errors.
-  if (this->num_collocated_clients_ > 0 
+  if (this->num_collocated_clients_ > 0
     && this->collocated_client_task_.failure_count () > 0)
     {
       return false;
@@ -363,7 +340,7 @@ ServerApp::check_validity ()
                          this->num_collocated_clients_;
 
   Foo_A_Statistics stats (num_clients);
-  
+
   Foo_A_ClientEngine::expected_results (stats);
 
   for (unsigned i = 0; i < this->num_servants_; i++)