1 files changed, 19 insertions, 32 deletions

diff --git a/TAO/utils/nslist/nsdel.cpp b/TAO/utils/nslist/nsdel.cpp
index 95655ffff09..99a9c958fd9 100644
--- a/TAO/utils/nslist/nsdel.cpp
+++ b/TAO/utils/nslist/nsdel.cpp
@@ -27,17 +27,15 @@
 int
 ACE_TMAIN (int argcw, ACE_TCHAR *argvw[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
   CosNaming::Name the_name (0);
   CORBA::ORB_var orb;
 
-  ACE_TRY
+  try
     {
       // Contact the orb
       ACE_Argv_Type_Converter argcon (argcw, argvw);
       orb = CORBA::ORB_init (argcon.get_argc (), argcon.get_ASCII_argv (),
-                             "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                             "");
 
       // Scan through the command line options
       bool
@@ -168,29 +166,25 @@ ACE_TMAIN (int argcw, ACE_TCHAR *argvw[])
                       "unless --ns is given. Displays all ID/Kinds found\n"
                       "on path unless --quiet is given.\n",
                       pname));
-          orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          orb->destroy ();
           return 1;
         }
 
       // Contact the name service
       CORBA::Object_var nc_obj;
       if (nameService)
-        nc_obj = orb->string_to_object (nameService ACE_ENV_ARG_PARAMETER);
+        nc_obj = orb->string_to_object (nameService);
       else
-        nc_obj = orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        nc_obj = orb->resolve_initial_references ("NameService");
 
       CosNaming::NamingContext_var root_nc =
-        CosNaming::NamingContext::_narrow (nc_obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CosNaming::NamingContext::_narrow (nc_obj.in ());
 
       if (CORBA::is_nil (root_nc.in ()))
         {
           ACE_DEBUG ((LM_DEBUG,
                       "Error: nil naming context\n"));
-          orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          orb->destroy ();
           return 1;
         }
 
@@ -212,33 +206,28 @@ ACE_TMAIN (int argcw, ACE_TCHAR *argvw[])
 
       // Attempt to locate the object and destroy/unbind it
       CORBA::Object_var
-        obj = root_nc->resolve( the_name ACE_ENV_ARG_PARAMETER );
-      ACE_TRY_CHECK;
+        obj = root_nc->resolve( the_name );
       CosNaming::NamingContext_var this_nc =
-        CosNaming::NamingContext::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CosNaming::NamingContext::_narrow (obj.in ());
       if (!CORBA::is_nil (this_nc.in ()))
         {
           if (destroy)
             {
               if (!quiet)
                 ACE_DEBUG ((LM_DEBUG,"Destroying\n"));
-              this_nc->destroy( ACE_ENV_SINGLE_ARG_PARAMETER );
-              ACE_TRY_CHECK;
+              this_nc->destroy( );
             }
           else if (!quiet)
             {
               CORBA::String_var str =
-                orb->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                orb->object_to_string (obj.in ());
               ACE_DEBUG ((LM_DEBUG,
                          "\n*** Possiably Orphaned Naming Context ***\n%s\n\n", str.in()));
             }
         }
       else if (destroy && !quiet)
         ACE_DEBUG ((LM_DEBUG,"Can't Destroy object, it is not a naming context!\n"));
-      root_nc->unbind (the_name ACE_ENV_ARG_PARAMETER );
-      ACE_TRY_CHECK;
+      root_nc->unbind (the_name );
       if (!quiet)
         {
           unsigned int index;
@@ -260,7 +249,7 @@ ACE_TMAIN (int argcw, ACE_TCHAR *argvw[])
           ACE_DEBUG ((LM_DEBUG, "\n"));
         }
     }
-  ACE_CATCH (CosNaming::NamingContext::NotFound, nf)
+  catch (const CosNaming::NamingContext::NotFound& nf)
     {
       unsigned int index;
       const unsigned int limit= the_name.length()-nf.rest_of_name.length();
@@ -288,7 +277,7 @@ ACE_TMAIN (int argcw, ACE_TCHAR *argvw[])
           why= "\nThe following is a naming context, not a final object binding";
           break;
         }
-      ACE_PRINT_EXCEPTION (nf, why );
+      nf._tao_print_exception (why);
       for (index= 0u; index < nf.rest_of_name.length(); ++index)
         {
           if (nf.rest_of_name[index].kind && nf.rest_of_name[index].kind[0])
@@ -299,19 +288,17 @@ ACE_TMAIN (int argcw, ACE_TCHAR *argvw[])
              ACE_DEBUG ((LM_DEBUG, "ID: %s\n",
                nf.rest_of_name[index].id.in()));
         }
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+      orb->destroy ();
       return 1;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       ACE_DEBUG ((LM_DEBUG, "\nError:\n"));
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception in nsdel");
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ex._tao_print_exception ("Exception in nsdel");
+      orb->destroy ();
       return 1;
     }
-  ACE_ENDTRY;
 
-  orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+  orb->destroy ();
   return 0;
 }