1 files changed, 11 insertions, 21 deletions

diff --git a/TAO/tests/Smart_Proxies/server.cpp b/TAO/tests/Smart_Proxies/server.cpp
index b4a86a45b7e..f1a83fa6b95 100644
--- a/TAO/tests/Smart_Proxies/server.cpp
+++ b/TAO/tests/Smart_Proxies/server.cpp
@@ -29,8 +29,7 @@ class Test_i : public POA_Test
 public:
   Test_i (CORBA::ORB_ptr orb);
 
-  CORBA::Short method  (CORBA::Short boo
-                        ACE_ENV_ARG_DECL)
+  CORBA::Short method  (CORBA::Short boo)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Test::Oops));
 
@@ -48,8 +47,7 @@ Test_i::Test_i (CORBA::ORB_ptr orb)
 }
 
 CORBA::Short
-Test_i :: method (CORBA::Short boo
-                  ACE_ENV_ARG_DECL)
+Test_i :: method (CORBA::Short boo)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Test::Oops))
 {
@@ -66,7 +64,7 @@ void
 Test_i::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
 
 static const char *ior_output_file = 0;
@@ -99,14 +97,12 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            ""
-                                            ACE_ENV_ARG_PARAMETER);
+                                            "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -114,12 +110,10 @@ main (int argc, char *argv[])
       Test_i servant (orb.in ());
       // Obtain RootPOA.
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (object.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (object.in ());
 
 
       // Get the POAManager of the RootPOA.
@@ -130,8 +124,7 @@ main (int argc, char *argv[])
         servant._this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (Test_object.in ()
-                               ACE_ENV_ARG_PARAMETER);
+        orb->object_to_string (Test_object.in ());
 
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
@@ -158,17 +151,14 @@ main (int argc, char *argv[])
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
       root_poa->destroy (1,
-                         1
-                         ACE_ENV_ARG_PARAMETER);
+                         1);
 
       orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception in setting up server");
+      ex._tao_print_exception ("Exception in setting up server");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }