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

4 files changed, 8 insertions, 32 deletions

diff --git a/TAO/tests/Big_Request_Muxing/Client_Task.cpp b/TAO/tests/Big_Request_Muxing/Client_Task.cpp
index 385bf7f0bc5..fa7e0375eb1 100644
--- a/TAO/tests/Big_Request_Muxing/Client_Task.cpp
+++ b/TAO/tests/Big_Request_Muxing/Client_Task.cpp
@@ -40,7 +40,6 @@ Client_Task::do_invocations(Test::Payload& payload ACE_ENV_SINGLE_ARG_DECL)
   for (int i = 0; i != this->event_count_; ++i)
     {
       this->payload_receiver_->more_data (payload ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
     }
 }
 
@@ -53,7 +52,6 @@ Client_Task::do_sync_none_invocations(Test::Payload& payload ACE_ENV_SINGLE_ARG_
   for (int i = 0; i != this->event_count_; ++i)
     {
       this->payload_receiver_->sync_none_more_data (payload ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
     }
 }
 
@@ -70,16 +68,13 @@ Client_Task::svc (void)
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      this->validate_connection (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->validate_connection ();
 
       CORBA::Object_var object =
         this->orb_->resolve_initial_references ("PolicyCurrent"
                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       CORBA::PolicyCurrent_var policy_current =
         CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       CORBA::Any scope_as_any;
       scope_as_any <<= this->sync_scope_;
@@ -91,12 +86,10 @@ Client_Task::svc (void)
         this->orb_->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
                                    scope_as_any
                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       policy_current->set_policy_overrides (policy_list,
                                             CORBA::ADD_OVERRIDE
                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       if (this->sync_scope_ == Messaging::SYNC_NONE)
         this->do_sync_none_invocations(payload ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -119,7 +112,7 @@ Client_Task::svc (void)
 }
 
 void
-Client_Task::validate_connection (ACE_ENV_SINGLE_ARG_DECL)
+Client_Task::validate_connection (void)
 {
   ACE_TRY
     {
@@ -127,7 +120,6 @@ Client_Task::validate_connection (ACE_ENV_SINGLE_ARG_DECL)
       for (int i = 0; i != 100; ++i)
         {
           (void) this->payload_receiver_->more_data (payload ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
         }
     }
   ACE_CATCHANY {} ACE_ENDTRY;
diff --git a/TAO/tests/Big_Request_Muxing/Client_Task.h b/TAO/tests/Big_Request_Muxing/Client_Task.h
index 81c8358c4a2..239e12701ea 100644
--- a/TAO/tests/Big_Request_Muxing/Client_Task.h
+++ b/TAO/tests/Big_Request_Muxing/Client_Task.h
@@ -36,7 +36,7 @@ public:
 private:
   /// Make sure that all threads have connections available to
   /// workaround bug 189
-  void validate_connection (ACE_ENV_SINGLE_ARG_DECL);
+  void validate_connection (void);
 
   void do_invocations(Test::Payload& payload ACE_ENV_SINGLE_ARG_DECL);
   void do_sync_none_invocations(Test::Payload& payload ACE_ENV_SINGLE_ARG_DECL);
diff --git a/TAO/tests/Big_Request_Muxing/client.cpp b/TAO/tests/Big_Request_Muxing/client.cpp
index 321eed0bd4a..b3ec79aac4b 100644
--- a/TAO/tests/Big_Request_Muxing/client.cpp
+++ b/TAO/tests/Big_Request_Muxing/client.cpp
@@ -49,18 +49,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::Payload_Receiver_var payload_receiver =
       Test::Payload_Receiver::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
 
     if (CORBA::is_nil (payload_receiver.in ()))
     {
@@ -111,7 +108,6 @@ main (int argc, char *argv[])
     {
       ACE_Time_Value tv (0, 100 * 1000);
       orb->run (tv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       if (task0.done() && task1.done() && task2.done())
         break;
     }
@@ -123,11 +119,9 @@ main (int argc, char *argv[])
     {
       ACE_Time_Value tv(0, 100 * 1000);
       orb->run(tv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
     }
 
-    orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    orb->destroy ();
   }
   ACE_CATCHANY
   {
diff --git a/TAO/tests/Big_Request_Muxing/server.cpp b/TAO/tests/Big_Request_Muxing/server.cpp
index 6b134f43f55..3d9d03a6a3b 100644
--- a/TAO/tests/Big_Request_Muxing/server.cpp
+++ b/TAO/tests/Big_Request_Muxing/server.cpp
@@ -51,11 +51,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,
@@ -64,11 +62,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;
@@ -80,12 +76,10 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var receiver_owner_transfer(payload_receiver_impl);
 
       Test::Payload_Receiver_var payload_receiver =
-        payload_receiver_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        payload_receiver_impl->_this ();
 
       CORBA::String_var ior =
         orb->object_to_string (payload_receiver.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -97,8 +91,7 @@ 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 ();
 
       ACE_DEBUG((LM_DEBUG, "Server waiting for messages...\n"));
 
@@ -114,7 +107,6 @@ main (int argc, char *argv[])
         int sn_prev_count = sn_count;
         ACE_Time_Value tv(0, 100 * 1000);
         orb->run (tv ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
         count = payload_receiver_impl->count();
         sn_count = payload_receiver_impl->count(true);
         if ((count < expected && count == prev_count) ||
@@ -157,10 +149,8 @@ main (int argc, char *argv[])
                   runtime.sec(), runtime.usec()));
 
       root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
 
       return result;
     }