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

1 files changed, 12 insertions, 18 deletions

diff --git a/TAO/tests/CallbackTest/server.cpp b/TAO/tests/CallbackTest/server.cpp
index 278bb19fecc..4017a6a9d42 100644
--- a/TAO/tests/CallbackTest/server.cpp
+++ b/TAO/tests/CallbackTest/server.cpp
@@ -39,16 +39,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,
@@ -61,11 +61,9 @@ main (int argc, char *argv[])
       // Make all oneways "reliable."
       {
         CORBA::Object_var manager_object =
-          orb->resolve_initial_references("ORBPolicyManager"
-                                          ACE_ENV_ARG_PARAMETER);
+          orb->resolve_initial_references("ORBPolicyManager");
         CORBA::PolicyManager_var policy_manager =
-          CORBA::PolicyManager::_narrow(manager_object.in()
-                                        ACE_ENV_ARG_PARAMETER);
+          CORBA::PolicyManager::_narrow(manager_object.in());
 
         if (CORBA::is_nil (policy_manager.in ()))
           ACE_ERROR_RETURN ((LM_ERROR,
@@ -76,12 +74,10 @@ main (int argc, char *argv[])
         CORBA::PolicyList policies(1); policies.length(1);
         policies[0] =
           orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
-                              policy_value
-                              ACE_ENV_ARG_PARAMETER);
+                              policy_value);
 
         policy_manager->set_policy_overrides (policies,
-                                              CORBA::ADD_OVERRIDE
-                                              ACE_ENV_ARG_PARAMETER);
+                                              CORBA::ADD_OVERRIDE);
 
         policies[0]->destroy ();
       }
@@ -99,7 +95,7 @@ main (int argc, char *argv[])
         service_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (service.in () ACE_ENV_ARG_PARAMETER);
+        orb->object_to_string (service.in ());
 
       // If the ior_output_file exists, output the ior to it
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -119,17 +115,15 @@ main (int argc, char *argv[])
 
       service_impl->dump_results ();
 
-      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;
 }