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

2 files changed, 13 insertions, 30 deletions

diff --git a/TAO/tests/Bug_1568_Regression/client.cpp b/TAO/tests/Bug_1568_Regression/client.cpp
index 44edda43ee7..4a637a9751c 100644
--- a/TAO/tests/Bug_1568_Regression/client.cpp
+++ b/TAO/tests/Bug_1568_Regression/client.cpp
@@ -47,18 +47,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 object =
         orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       Baz::C_var cobject =
         Baz::C::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       if (CORBA::is_nil (cobject.in ()))
         {
@@ -68,14 +65,10 @@ main (int argc, char *argv[])
                             1);
         }
 
-      cobject->op1 (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      cobject->op2 (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      cobject->op3 (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      cobject->op4 (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      cobject->op1 ();
+      cobject->op2 ();
+      cobject->op3 ();
+      cobject->op4 ();
     }
   ACE_CATCHANY
     {
diff --git a/TAO/tests/Bug_1568_Regression/server.cpp b/TAO/tests/Bug_1568_Regression/server.cpp
index fce73b267a5..fad92bf3786 100644
--- a/TAO/tests/Bug_1568_Regression/server.cpp
+++ b/TAO/tests/Bug_1568_Regression/server.cpp
@@ -63,7 +63,7 @@ Simple_C::op1(
     ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  _tao_rh->op1(ACE_ENV_SINGLE_ARG_PARAMETER);
+  _tao_rh->op1();
 }
 
 void
@@ -72,7 +72,7 @@ Simple_C::op2(
     ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  _tao_rh->op2(ACE_ENV_SINGLE_ARG_PARAMETER);
+  _tao_rh->op2();
 }
 
 void
@@ -81,7 +81,7 @@ Simple_C::op3(
     ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  _tao_rh->op3(ACE_ENV_SINGLE_ARG_PARAMETER);
+  _tao_rh->op3();
 }
 
 void
@@ -90,7 +90,7 @@ Simple_C::op4(
     ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  _tao_rh->op4(ACE_ENV_SINGLE_ARG_PARAMETER);
+  _tao_rh->op4();
 }
 
 // ****************************************************************
@@ -130,15 +130,12 @@ 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;
 
       PortableServer::POA_var root_poa =
         PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -146,8 +143,7 @@ main (int argc, char *argv[])
                           1);
 
       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;
@@ -156,12 +152,10 @@ main (int argc, char *argv[])
           new Simple_C(orb.in()));
 
       Baz::C_var simple_c =
-        simple_c_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        simple_c_impl->_this ();
 
       CORBA::String_var ior =
         orb->object_to_string (simple_c.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // Output the IOR to the <ior_output_file>
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -173,19 +167,15 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       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_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
       root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
   ACE_CATCHANY
     {