1 files changed, 11 insertions, 18 deletions

diff --git a/TAO/orbsvcs/examples/PSS/client.cpp b/TAO/orbsvcs/examples/PSS/client.cpp
index 95f4df6406d..2c7925e15b2 100644
--- a/TAO/orbsvcs/examples/PSS/client.cpp
+++ b/TAO/orbsvcs/examples/PSS/client.cpp
@@ -26,22 +26,20 @@
 int main (int argc, char *argv [])
 {
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         "" /* the ORB name, it can be anything! */
-                         ACE_ENV_ARG_PARAMETER);
+                         "" /* the ORB name, it can be anything! */);
 
       // Get a reference to the RootPOA
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA");
 
       // Narrow down to the correct reference
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in ());
 
       // Set a POA Manager
       PortableServer::POAManager_var poa_manager =
@@ -52,27 +50,23 @@ int main (int argc, char *argv [])
 
       // Get a reference to Simple_Naming
       CORBA::Object_var simple_naming_object =
-        orb->resolve_initial_references ("Simple_Naming" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("Simple_Naming");
 
       // Narrow down the reference
       Simple_Naming::Naming_Context_var simple_naming =
-        Simple_Naming::Naming_Context::_narrow (simple_naming_object.in()
-                                                ACE_ENV_ARG_PARAMETER);
+        Simple_Naming::Naming_Context::_narrow (simple_naming_object.in());
 
       Simple_Naming::Name name = CORBA::string_dup ("Server");
 
       CORBA::String_var ior_string =
-        simple_naming->find (name
-                             ACE_ENV_ARG_PARAMETER);
+        simple_naming->find (name);
 
       // Connect to the server
       CORBA::Object_var tmp =
-        orb->string_to_object(ior_string.in ()
-                              ACE_ENV_ARG_PARAMETER);
+        orb->string_to_object(ior_string.in ());
 
       Simple_Server::Server_var server =
-        Simple_Server::Server::_narrow (tmp.in ()
-                                        ACE_ENV_ARG_PARAMETER);
+        Simple_Server::Server::_narrow (tmp.in ());
 
       CORBA::String_var status =
         server->get_status ();
@@ -84,12 +78,11 @@ int main (int argc, char *argv [])
           return -1;
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+      ACE_PRINT_EXCEPTION (ex,
                            "Client raised an exception:\n");
     }
-  ACE_ENDTRY;
 
   return 0;
 }