Merged version 94552 from main trunk into this branchalt_mapping_SAIC

1 files changed, 14 insertions, 6 deletions

diff --git a/utils/nslist/nsdel.cpp b/utils/nslist/nsdel.cpp
index 0b426a93c8d..995ad096eec 100644
--- a/utils/nslist/nsdel.cpp
+++ b/utils/nslist/nsdel.cpp
@@ -62,6 +62,7 @@ namespace
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  int err = 0;
   CosNaming::Name the_name (0);
   CORBA::ORB_var orb;
 
@@ -331,7 +332,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
             }
           }
       }
-      orb->destroy ();
     }
   catch (const CosNaming::NamingContext::NotFound& nf)
     {
@@ -372,16 +372,24 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
              ACE_DEBUG ((LM_DEBUG, "ID: %C\n",
                nf.rest_of_name[index].id.in()));
         }
-      orb->destroy ();
-      return 1;
+      ++err;
     }
   catch (const CORBA::Exception& ex)
     {
       ACE_DEBUG ((LM_DEBUG, "\nError:\n"));
       ex._tao_print_exception ("Exception in nsdel");
-      orb->destroy ();
-      return 1;
+      ++err;
     }
 
-  return 0;
+  try
+    {
+      orb->destroy ();
+    }
+  catch (const CORBA::Exception& ex)
+    {
+      ACE_DEBUG ((LM_DEBUG, "\nError:\n"));
+      ex._tao_print_exception ("Exception in while shutting down");
+      ++err;
+    }
+  return err;
 }