4 files changed, 15 insertions, 35 deletions

diff --git a/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.cpp b/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.cpp
index dbfcefcb23b..87944856506 100644
--- a/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.cpp
+++ b/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.cpp
@@ -16,19 +16,15 @@ Test_i::Test_i (CORBA::ORB_ptr orb) :
       CORBA::Object_var obj =
         orb_->resolve_initial_references ("RootPOA"
                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       this->root_poa_ =
         PortableServer::POA::_narrow (obj.in ()
                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       policies_.length(1);
       policies_[0] =
         root_poa_->create_lifespan_policy (PortableServer::PERSISTENT
                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       this->poa_mgr_ =
-        this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->root_poa_->the_POAManager ();
     }
   ACE_CATCHANY
     {
@@ -46,7 +42,7 @@ Test_i::~Test_i (void)
 }
 
 int
-Test_i::try_and_create_POA (ACE_ENV_SINGLE_ARG_DECL)
+Test_i::try_and_create_POA (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
@@ -56,7 +52,6 @@ Test_i::try_and_create_POA (ACE_ENV_SINGLE_ARG_DECL)
                                poa_mgr_.in (),
                                this->policies_
                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::TRANSIENT, ex)
     {
@@ -79,7 +74,7 @@ Test_i::try_and_create_POA (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-Test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Test_i::shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
    orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.h b/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.h
index 6e548f96463..59e2f65f292 100644
--- a/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.h
+++ b/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.h
@@ -18,12 +18,12 @@ public:
    ~Test_i (void);
 
    /// Try and create a persistant POA
-   int try_and_create_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+   int try_and_create_POA (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
-      
-   void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+
+   void shutdown (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
 protected:
    CORBA::ORB_var orb_;
    PortableServer::POA_var root_poa_;
diff --git a/TAO/orbsvcs/tests/Bug_1395_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_1395_Regression/client.cpp
index 69909f4e3d5..a33f0a4c648 100644
--- a/TAO/orbsvcs/tests/Bug_1395_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_1395_Regression/client.cpp
@@ -19,7 +19,7 @@ parse_args (int argc, char *argv[])
         ior = get_opts.opt_arg ();
         break;
       case 's':
-        shutdown_server = 1; 
+        shutdown_server = 1;
         break;
       case '?':
       default:
@@ -42,18 +42,15 @@ main (int argc, char *argv[])
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
         orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       Test_var server =
         Test::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -65,17 +62,14 @@ main (int argc, char *argv[])
 
       if (shutdown_server)
       {
-        server->shutdown(ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        server->shutdown();
       }
       else
       {
-        result = server->try_and_create_POA(ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        result = server->try_and_create_POA();
       }
-      
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+
+      orb->destroy ();
     }
   ACE_CATCHANY
     {
diff --git a/TAO/orbsvcs/tests/Bug_1395_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_1395_Regression/server.cpp
index 65c1f4c8a2b..e13495b805c 100644
--- a/TAO/orbsvcs/tests/Bug_1395_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_1395_Regression/server.cpp
@@ -40,11 +40,9 @@ main (int argc, char *argv[])
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -53,11 +51,9 @@ main (int argc, char *argv[])
 
       PortableServer::POA_var root_poa =
         PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -66,15 +62,12 @@ main (int argc, char *argv[])
 
       root_poa->activate_object (&server_impl
                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
 
       CORBA::Object_var server = server_impl._this();
-      ACE_TRY_CHECK;
 
       CORBA::String_var ior =
         orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
@@ -101,12 +94,10 @@ main (int argc, char *argv[])
         }
 
       poa_manager->activate();
-      
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+
+      orb->run ();
 
       root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {