1 files changed, 61 insertions, 55 deletions

diff --git a/TAO/tests/InterOp-Naming/INS_test_client.cpp b/TAO/tests/InterOp-Naming/INS_test_client.cpp
index 29538e30303..154bf690f08 100644
--- a/TAO/tests/InterOp-Naming/INS_test_client.cpp
+++ b/TAO/tests/InterOp-Naming/INS_test_client.cpp
@@ -7,79 +7,81 @@
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+
+  CORBA::Environment ACE_TRY_ENV;
+
   ACE_TRY
     {
+
       // Retrieve a reference to the ORB.
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
-                                            0,
-                                            ACE_TRY_ENV);
+      CORBA::ORB_var orb_ = CORBA::ORB_init (argc,
+                                             argv,
+                                             0,
+                                             ACE_TRY_ENV);
       ACE_TRY_CHECK;
-
+      
       if (argc < 2)
         {
           ACE_DEBUG ((LM_DEBUG,
                       "No Name specified to be resolved\n"));
-          return 0;
         }
+      else
+        {
+          CORBA::Object_var objref =
+            orb_->resolve_initial_references (argv[1]);
 
-      CORBA::Object_var objref =
-        orb->resolve_initial_references (argv[1], ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (objref.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           " (%P|%t) Unable to resolve the given Name.\n"),
-                          -1);
+          if (CORBA::is_nil (objref.in ()))
+            ACE_ERROR_RETURN ((LM_ERROR,
+                               " (%P|%t) Unable to resolve the given Name.\n"),
+                              -1);
 
-      if (ACE_OS::strcmp (argv[1], "NameService") == 0)
-        {
-          CosNaming::NamingContext_var naming_context =
-            CosNaming::NamingContext::_narrow (objref.in (),
-                                               ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          if (ACE_OS::strcmp (argv[1], "NameService") == 0)
+            {
               
-          ACE_DEBUG ((LM_DEBUG,
-                      "Resolved IOR for %s : %s\n",
-                      argv[1],
-                      orb->object_to_string (naming_context.in ())));
-
-          // Sanity check to see if the reference to Naming
-          // Context is alright.
-          CosNaming::Name my_name;
-          my_name.length (1);
-          my_name[0].id = CORBA::string_dup ("ObjName");
+              CosNaming::NamingContext_var naming_context =
+                CosNaming::NamingContext::_narrow (objref.in (),
+                                                   ACE_TRY_ENV);
+              ACE_TRY_CHECK;
+              
+              ACE_DEBUG ((LM_DEBUG,
+                          "Resolved IOR for %s : %s\n",
+                          argv[1],
+                          orb_->object_to_string (naming_context.in ())));
 
-          naming_context->bind (my_name,
-                                objref.in (),
-                                ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+              // Sanity check to see if the reference to Naming Context is alright.
+              CosNaming::Name my_name;
+              my_name.length (1);
+              my_name[0].id = CORBA::string_dup ("ObjName");
 
-          ACE_DEBUG ((LM_DEBUG,
-                      "\nBind successful on the resolved Naming Context\n"));
+              naming_context->bind (my_name,
+                                    objref.in (),
+                                    ACE_TRY_ENV);
+              ACE_TRY_CHECK;
 
-        }
-      else
-        {
-          INS_var server = INS::_narrow (objref.in (),
-                                         ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+              ACE_DEBUG ((LM_DEBUG,
+                          "\nBind successful on the resolved Naming Context\n"));
 
-          ACE_DEBUG ((LM_DEBUG,
-                      "Resolved IOR for %s : %s\n",
-                      argv[1],
-                      orb->object_to_string (server.in ())));
+            }
+          else
+            {
+              
+              INS_var server = INS::_narrow (objref.in (),
+                                             ACE_TRY_ENV);
+              ACE_TRY_CHECK;
 
-          ACE_DEBUG ((LM_DEBUG,
-                      "\nResult of Remote Call : %s\n",
-                      server->test_ins (ACE_TRY_ENV)));
+              ACE_DEBUG ((LM_DEBUG,
+                          "Resolved IOR for %s : %s\n",
+                          argv[1],
+                          orb_->object_to_string (server.in ())));
+              
+              ACE_DEBUG ((LM_DEBUG,
+                          "\nResult of Remote Call : %s\n",
+                          server->test_ins (ACE_TRY_ENV)));
+              
+            }
+          
         }
     }
-  ACE_CATCH (CORBA::ORB::InvalidName, name)
-    {
-      ACE_DEBUG ((LM_DEBUG, "Cannot resolve <%s>\n", argv[1]));
-    }
   ACE_CATCHANY
     {
        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception:");
@@ -87,6 +89,10 @@ main (int argc, char *argv[])
 
   ACE_ENDTRY;
   ACE_CHECK_RETURN (-1);
-
+  
   return 0;
 }
+
+
+
+