1 files changed, 10 insertions, 22 deletions

diff --git a/CIAO/DAnCE/RepositoryManager/RMadmin.cpp b/CIAO/DAnCE/RepositoryManager/RMadmin.cpp
index 61803ce1347..f61a9f2a71e 100644
--- a/CIAO/DAnCE/RepositoryManager/RMadmin.cpp
+++ b/CIAO/DAnCE/RepositoryManager/RMadmin.cpp
@@ -39,13 +39,12 @@ static const char *RMname_service;
 /// main function that provides a sample interface for RM clients
 int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Initialize orb
       CORBA::ORB_var orb = CORBA::ORB_init (argc, argv,
-                      ""ACE_ENV_ARG_PARAMETER);
+                      "");
 
-      ACE_TRY_CHECK;
 
       Options* options = TheOptions::instance ();
       if (!options->parse_args (argc, argv))
@@ -55,8 +54,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
       if (options->write_to_ior_)
       {
-        obj = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        obj = orb->string_to_object (ior);
       }
 
       else if (options->register_with_ns_)
@@ -66,13 +64,10 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
         // Naming Service related operations
         CORBA::Object_var naming_context_object =
-          orb->resolve_initial_references ("NameService"
-          ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK_RETURN (false);
+          orb->resolve_initial_references ("NameService");
 
         CosNaming::NamingContext_var naming_context =
           CosNaming::NamingContext::_narrow (naming_context_object.in ());
-        ACE_TRY_CHECK;
 
         // Initialize the Naming Sequence
         CosNaming::Name name (1);
@@ -83,14 +78,11 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
         // Resolve object from name
         obj = naming_context->resolve (name);
-        ACE_TRY_CHECK;
       }
 
 
     CIAO::RepositoryManagerDaemon_var rm =
-      CIAO::RepositoryManagerDaemon::_narrow (obj.in ()
-                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CIAO::RepositoryManagerDaemon::_narrow (obj.in ());
 
       if (CORBA::is_nil (rm.in ()))
         {
@@ -193,19 +185,18 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
         Deployment::PackageConfiguration *pc = new Deployment::PackageConfiguration ();
 
         // Parse the PCD to make sure that there are no package errors.
-        ACE_TRY
+        try
         {
           CIAO::Config_Handlers::Packaging::PCD_Handler::package_config ("default.pcd", *pc);
         }
-        ACE_CATCHALL
+        catch (...)
         {
           ACE_ERROR ((
             LM_ERROR,
             "(%P|%t) [RM::retrieve_PC_from_descriptors] Error parsing the PCD\n"));
 
-          ACE_THROW (Deployment::PackageError ());
+          throw Deployment::PackageError ();
         }
-        ACE_ENDTRY;
 
         ACE_OS::chdir (cwd);
 
@@ -247,15 +238,12 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     }
 
       orb->shutdown (1);
-      ACE_TRY_CHECK;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Unknown exception \n");
+      ex._tao_print_exception ("Unknown exception \n");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }