ChangeLogTag: Thu Jan 25 17:39:59 UTC 2007 Chad Elliott <elliott_c@ociweb.com>

6 files changed, 23 insertions, 33 deletions

diff --git a/TAO/tests/Muxing/Client_Task.cpp b/TAO/tests/Muxing/Client_Task.cpp
index 548952c84fe..e83bea1f1d9 100644
--- a/TAO/tests/Muxing/Client_Task.cpp
+++ b/TAO/tests/Muxing/Client_Task.cpp
@@ -27,19 +27,17 @@ Client_Task::svc (void)
   for (CORBA::ULong j = 0; j != payload.length (); ++j)
     payload[j] = (j % 256);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       for (int i = 0; i != this->event_count_; ++i)
         {
-          this->receiver_->receive_data (payload ACE_ENV_ARG_PARAMETER);
+          this->receiver_->receive_data (payload);
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       return -1;
     }
-  ACE_ENDTRY;
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Client task finished\n"));
   return 0;
 }
diff --git a/TAO/tests/Muxing/Receiver.cpp b/TAO/tests/Muxing/Receiver.cpp
index f20a339cd74..051bbb2e124 100644
--- a/TAO/tests/Muxing/Receiver.cpp
+++ b/TAO/tests/Muxing/Receiver.cpp
@@ -24,8 +24,7 @@ Receiver::dump_results ()
 }
 
 void
-Receiver::receive_data (const Test::Payload &payload
-                        ACE_ENV_ARG_DECL_NOT_USED)
+Receiver::receive_data (const Test::Payload &payload)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mutex_);
@@ -45,5 +44,5 @@ void
 Receiver::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Muxing/Receiver.h b/TAO/tests/Muxing/Receiver.h
index 30fb08c40ea..8117eab65f2 100644
--- a/TAO/tests/Muxing/Receiver.h
+++ b/TAO/tests/Muxing/Receiver.h
@@ -28,8 +28,7 @@ public:
   void dump_results (void);
 
   // = The skeleton methods
-  virtual void receive_data (const Test::Payload &payload
-                             ACE_ENV_ARG_DECL)
+  virtual void receive_data (const Test::Payload &payload)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual CORBA::Long get_event_count (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
diff --git a/TAO/tests/Muxing/Server_Task.cpp b/TAO/tests/Muxing/Server_Task.cpp
index 9cf0b292946..2bd40e20e75 100644
--- a/TAO/tests/Muxing/Server_Task.cpp
+++ b/TAO/tests/Muxing/Server_Task.cpp
@@ -17,8 +17,7 @@ int
 Server_Task::svc (void)
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting server task\n"));
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
 #if defined (ACE_OPENVMS)
       // OpenVMS typically takes a lot longer...
@@ -27,13 +26,12 @@ Server_Task::svc (void)
       // run the test for at most 120 seconds...
       ACE_Time_Value tv (120, 0);
 #endif
-      this->orb_->run (tv ACE_ENV_ARG_PARAMETER);
+      this->orb_->run (tv);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       return -1;
     }
-  ACE_ENDTRY;
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Server task finished\n"));
   return 0;
 }
diff --git a/TAO/tests/Muxing/client.cpp b/TAO/tests/Muxing/client.cpp
index c1638ce81f8..e436d187fa6 100644
--- a/TAO/tests/Muxing/client.cpp
+++ b/TAO/tests/Muxing/client.cpp
@@ -40,19 +40,19 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
+        orb->string_to_object(ior);
 
       Test::Receiver_var receiver =
-        Test::Receiver::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
+        Test::Receiver::_narrow(tmp.in ());
 
       if (CORBA::is_nil (receiver.in ()))
         {
@@ -91,13 +91,11 @@ main (int argc, char *argv[])
         }
       orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Muxing/server.cpp b/TAO/tests/Muxing/server.cpp
index 0cf3c09e7de..7b2cdfe889a 100644
--- a/TAO/tests/Muxing/server.cpp
+++ b/TAO/tests/Muxing/server.cpp
@@ -36,13 +36,13 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -50,7 +50,7 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
         root_poa->the_POAManager ();
@@ -68,7 +68,7 @@ main (int argc, char *argv[])
         receiver_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (receiver.in () ACE_ENV_ARG_PARAMETER);
+        orb->object_to_string (receiver.in ());
 
       // If the ior_output_file exists, output the ior to it
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -93,17 +93,15 @@ main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "Now terminating test\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1);
 
       orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }