Wed Jan 24 14:00:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

4 files changed, 7 insertions, 21 deletions

diff --git a/TAO/tests/Bug_2174_Regression/client.cpp b/TAO/tests/Bug_2174_Regression/client.cpp
index dc0b7923d30..ac2fea6eda8 100644
--- a/TAO/tests/Bug_2174_Regression/client.cpp
+++ b/TAO/tests/Bug_2174_Regression/client.cpp
@@ -48,18 +48,15 @@ int 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 object =
         orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       Simple_Server_var server =
         Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -70,7 +67,6 @@ int main (int argc, char* argv[])
         }
 
       CORBA::Boolean non_existent = server->_non_existent ();
-      ACE_TRY_CHECK;
 
       if (non_existent)
           result = 3;
@@ -81,8 +77,7 @@ int main (int argc, char* argv[])
                   "client (%P) _non_existent() returned %d\n",
                   static_cast<int>(non_existent) ));
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
   ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
   {
diff --git a/TAO/tests/Bug_2174_Regression/server.cpp b/TAO/tests/Bug_2174_Regression/server.cpp
index bc39027c4ac..a41b92e88da 100644
--- a/TAO/tests/Bug_2174_Regression/server.cpp
+++ b/TAO/tests/Bug_2174_Regression/server.cpp
@@ -47,14 +47,12 @@ 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 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,
@@ -63,21 +61,17 @@ 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 ();
 
       Simple_Server_i server_impl (orb.in ());
 
       Simple_Server_var server =
-        server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        server_impl._this ();
 
       CORBA::String_var ior =
         orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       if (remove_object)
       {
@@ -87,7 +81,6 @@ main (int argc, char *argv[])
                       "server (%P) deactivated object immediately\n"
                     ));
       }
-      ACE_TRY_CHECK;
 
 
       // ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
@@ -105,11 +98,9 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
     }
   ACE_CATCHANY
     {
diff --git a/TAO/tests/Bug_2174_Regression/test_i.cpp b/TAO/tests/Bug_2174_Regression/test_i.cpp
index 9f1bd8537bc..f3a30e0718c 100644
--- a/TAO/tests/Bug_2174_Regression/test_i.cpp
+++ b/TAO/tests/Bug_2174_Regression/test_i.cpp
@@ -28,7 +28,7 @@ Simple_Server_i::echo (CORBA::Long x,
 }
 
 void
-Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Simple_Server_i::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/tests/Bug_2174_Regression/test_i.h b/TAO/tests/Bug_2174_Regression/test_i.h
index 00018fa25d8..3a8aecfe32c 100644
--- a/TAO/tests/Bug_2174_Regression/test_i.h
+++ b/TAO/tests/Bug_2174_Regression/test_i.h
@@ -35,7 +35,7 @@ public:
                     CORBA::Long msecs
                     ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private: