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

8 files changed, 35 insertions, 50 deletions

diff --git a/TAO/tests/GIOP_Fragments/Java_Big_Reply/Client_Task.cpp b/TAO/tests/GIOP_Fragments/Java_Big_Reply/Client_Task.cpp
index 73f2c212aef..c8696ddd004 100644
--- a/TAO/tests/GIOP_Fragments/Java_Big_Reply/Client_Task.cpp
+++ b/TAO/tests/GIOP_Fragments/Java_Big_Reply/Client_Task.cpp
@@ -21,10 +21,9 @@ Client_Task::svc (void)
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting client task\n"));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
 
   // Now get the big replies..
-  ACE_TRY
+  try
     {
       for (int i = 0; i != this->event_count_; ++i)
         {
@@ -46,13 +45,11 @@ Client_Task::svc (void)
 //          ACE_OS::sleep(tv);
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception Caught \n");
+      ex._tao_print_exception ("Exception Caught \n");
       return -1;
     }
-  ACE_ENDTRY;
 
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Client task finished\n"));
   return 0;
diff --git a/TAO/tests/GIOP_Fragments/Java_Big_Reply/client.cpp b/TAO/tests/GIOP_Fragments/Java_Big_Reply/client.cpp
index 85ae17ba6b1..857550b9eef 100644
--- a/TAO/tests/GIOP_Fragments/Java_Big_Reply/client.cpp
+++ b/TAO/tests/GIOP_Fragments/Java_Big_Reply/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::Big_Reply_var reply_gen =
-        Test::Big_Reply::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
+        Test::Big_Reply::_narrow(tmp.in ());
 
       if (CORBA::is_nil (reply_gen.in ()))
         {
@@ -78,13 +78,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/GIOP_Fragments/Java_Big_Request/Payload_Receiver.cpp b/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.cpp
index 58e009fa9c2..a3f70b42eb9 100644
--- a/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.cpp
+++ b/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.cpp
@@ -12,8 +12,7 @@ Payload_Receiver::Payload_Receiver (CORBA::ORB_ptr orb)
 }
 
 void
-Payload_Receiver::more_data (const Test::Payload &payload
-                             ACE_ENV_ARG_DECL)
+Payload_Receiver::more_data (const Test::Payload &payload)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Test::Payload_Receiver::Invalid_Payload))
 {
@@ -24,7 +23,7 @@ Payload_Receiver::more_data (const Test::Payload &payload
     {
       if (payload[i] != 'A')
         {
-          ACE_THROW (Test::Payload_Receiver::Invalid_Payload ());
+          throw Test::Payload_Receiver::Invalid_Payload ();
         }
     }
 }
@@ -34,7 +33,7 @@ void
 Payload_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/GIOP_Fragments/Java_Big_Request/Payload_Receiver.h b/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.h
index d8e18b0686c..3ea7ab3acaa 100644
--- a/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.h
+++ b/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.h
@@ -20,8 +20,7 @@ public:
   Payload_Receiver (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual void more_data (const Test::Payload &payload
-                          ACE_ENV_ARG_DECL)
+  virtual void more_data (const Test::Payload &payload)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Test::Payload_Receiver::Invalid_Payload));
 
diff --git a/TAO/tests/GIOP_Fragments/Java_Big_Request/server.cpp b/TAO/tests/GIOP_Fragments/Java_Big_Request/server.cpp
index 78d90dd7758..7205e3bf539 100644
--- a/TAO/tests/GIOP_Fragments/Java_Big_Request/server.cpp
+++ b/TAO/tests/GIOP_Fragments/Java_Big_Request/server.cpp
@@ -37,13 +37,13 @@ int
 main (int argc, char *argv[])
 {
   int status = 0;
-  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,
@@ -51,7 +51,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 ();
@@ -69,7 +69,7 @@ main (int argc, char *argv[])
         payload_receiver_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (payload_receiver.in () ACE_ENV_ARG_PARAMETER);
+        orb->object_to_string (payload_receiver.in ());
 
       // If the ior_output_file exists, output the ior to it
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -94,17 +94,15 @@ main (int argc, char *argv[])
           ++status;
         }
 
-      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:");
       ++status;
     }
-  ACE_ENDTRY;
 
   return status;
 }
diff --git a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.cpp b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.cpp
index 98efb9987b6..da443e12eab 100644
--- a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.cpp
+++ b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.cpp
@@ -12,8 +12,7 @@ Payload_Receiver::Payload_Receiver (CORBA::ORB_ptr orb)
 }
 
 void
-Payload_Receiver::more_data (const Test::Payload &payload
-                             ACE_ENV_ARG_DECL)
+Payload_Receiver::more_data (const Test::Payload &payload)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Test::Payload_Receiver::Invalid_Payload))
 {
@@ -24,7 +23,7 @@ Payload_Receiver::more_data (const Test::Payload &payload
     {
       if (payload[i] != 'A')
         {
-          ACE_THROW (Test::Payload_Receiver::Invalid_Payload ());
+          throw Test::Payload_Receiver::Invalid_Payload ();
         }
     }
 }
@@ -34,7 +33,7 @@ void
 Payload_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/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.h b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.h
index 36a6e98a37c..e48ab5b2b05 100644
--- a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.h
+++ b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.h
@@ -20,8 +20,7 @@ public:
   Payload_Receiver (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual void more_data (const Test::Payload &payload
-                          ACE_ENV_ARG_DECL)
+  virtual void more_data (const Test::Payload &payload)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Test::Payload_Receiver::Invalid_Payload));
 
diff --git a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/server.cpp b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/server.cpp
index 7a6aa3e16ad..6a56a1ab3c1 100644
--- a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/server.cpp
+++ b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/server.cpp
@@ -37,13 +37,13 @@ int
 main (int argc, char *argv[])
 {
   int status = 0;
-  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,
@@ -51,7 +51,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 ();
@@ -78,15 +78,13 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var receiver_owner_transfer(payload_receiver_impl);
 
       PortableServer::ObjectId_var id =
-        persistent_poa->activate_object (payload_receiver_impl
-                                         ACE_ENV_ARG_PARAMETER);
+        persistent_poa->activate_object (payload_receiver_impl);
 
       CORBA::Object_var obj =
-        persistent_poa->id_to_reference (id.in ()
-                                         ACE_ENV_ARG_PARAMETER);
+        persistent_poa->id_to_reference (id.in ());
 
       CORBA::String_var ior =
-        orb->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER);
+        orb->object_to_string (obj.in ());
 
       // If the ior_output_file exists, output the ior to it
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -111,17 +109,15 @@ main (int argc, char *argv[])
           ++status;
         }
 
-      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:");
       ++status;
     }
-  ACE_ENDTRY;
 
   return status;
 }