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

2 files changed, 22 insertions, 33 deletions

diff --git a/TAO/tests/Bug_1568_Regression/client.cpp b/TAO/tests/Bug_1568_Regression/client.cpp
index 4a637a9751c..d1a8e9ecdf1 100644
--- a/TAO/tests/Bug_1568_Regression/client.cpp
+++ b/TAO/tests/Bug_1568_Regression/client.cpp
@@ -43,19 +43,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 object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
+        orb->string_to_object (ior);
 
       Baz::C_var cobject =
-        Baz::C::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+        Baz::C::_narrow (object.in ());
 
       if (CORBA::is_nil (cobject.in ()))
         {
@@ -70,12 +70,11 @@ main (int argc, char *argv[])
       cobject->op3 ();
       cobject->op4 ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "");
+      ex._tao_print_exception ("");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Bug_1568_Regression/server.cpp b/TAO/tests/Bug_1568_Regression/server.cpp
index fad92bf3786..f14b9ce628d 100644
--- a/TAO/tests/Bug_1568_Regression/server.cpp
+++ b/TAO/tests/Bug_1568_Regression/server.cpp
@@ -28,20 +28,16 @@ public:
   Simple_C (CORBA::ORB_ptr orb);
 
   void op1 (
-      Foo::Bar::AMH_AResponseHandler_ptr _tao_rh
-      ACE_ENV_ARG_DECL)
+      Foo::Bar::AMH_AResponseHandler_ptr _tao_rh)
     ACE_THROW_SPEC ((CORBA::SystemException));
   void op2 (
-      Foo::Bar::AMH_AResponseHandler_ptr _tao_rh
-      ACE_ENV_ARG_DECL)
+      Foo::Bar::AMH_AResponseHandler_ptr _tao_rh)
     ACE_THROW_SPEC ((CORBA::SystemException));
   void op3 (
-      Foo::Bar::AMH_BResponseHandler_ptr _tao_rh
-      ACE_ENV_ARG_DECL)
+      Foo::Bar::AMH_BResponseHandler_ptr _tao_rh)
     ACE_THROW_SPEC ((CORBA::SystemException));
   void op4 (
-      Baz::AMH_CResponseHandler_ptr _tao_rh
-      ACE_ENV_ARG_DECL)
+      Baz::AMH_CResponseHandler_ptr _tao_rh)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 protected:
@@ -59,8 +55,7 @@ Simple_C::Simple_C (CORBA::ORB_ptr orb)
 
 void
 Simple_C::op1(
-    Foo::Bar::AMH_AResponseHandler_ptr _tao_rh
-    ACE_ENV_ARG_DECL)
+    Foo::Bar::AMH_AResponseHandler_ptr _tao_rh)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   _tao_rh->op1();
@@ -68,8 +63,7 @@ Simple_C::op1(
 
 void
 Simple_C::op2(
-    Foo::Bar::AMH_AResponseHandler_ptr _tao_rh
-    ACE_ENV_ARG_DECL)
+    Foo::Bar::AMH_AResponseHandler_ptr _tao_rh)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   _tao_rh->op2();
@@ -77,8 +71,7 @@ Simple_C::op2(
 
 void
 Simple_C::op3(
-    Foo::Bar::AMH_BResponseHandler_ptr _tao_rh
-    ACE_ENV_ARG_DECL)
+    Foo::Bar::AMH_BResponseHandler_ptr _tao_rh)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   _tao_rh->op3();
@@ -86,8 +79,7 @@ Simple_C::op3(
 
 void
 Simple_C::op4(
-    Baz::AMH_CResponseHandler_ptr _tao_rh
-    ACE_ENV_ARG_DECL)
+    Baz::AMH_CResponseHandler_ptr _tao_rh)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   _tao_rh->op4();
@@ -126,16 +118,16 @@ 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");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -155,7 +147,7 @@ main (int argc, char *argv[])
         simple_c_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (simple_c.in () ACE_ENV_ARG_PARAMETER);
+        orb->object_to_string (simple_c.in ());
 
       // Output the IOR to the <ior_output_file>
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -173,17 +165,15 @@ main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\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;
 }