1 files changed, 32 insertions, 73 deletions

diff --git a/TAO/tests/NestedUpcall/Reactor/server.cpp b/TAO/tests/NestedUpcall/Reactor/server.cpp
index 4b7d4e9a761..c3afbeea4fb 100644
--- a/TAO/tests/NestedUpcall/Reactor/server.cpp
+++ b/TAO/tests/NestedUpcall/Reactor/server.cpp
@@ -5,15 +5,14 @@
 ACE_RCSID(Reactor, server, "$Id$")
 
 NestedUpCalls_Server::NestedUpCalls_Server (void)
-  : use_naming_service_ (1),
-    ior_output_file_ (0)
+  : ior_output_file_ (0)
 {
 }
 
 int
 NestedUpCalls_Server::parse_args (void)
 {
-  ACE_Get_Opt get_opts (argc_, argv_, "dn:o:s");
+  ACE_Get_Opt get_opts (argc_, argv_, "dn:o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -22,16 +21,15 @@ NestedUpCalls_Server::parse_args (void)
       case 'd':  // debug flag.
         TAO_debug_level++;
         break;
-          case 'o': // output the IOR to a file.
+
+      case 'o': // output the IOR to a file.
         this->ior_output_file_ = ACE_OS::fopen (get_opts.optarg, "w");
         if (this->ior_output_file_ == 0)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "Unable to open %s for writing: %p\n",
                              get_opts.optarg), -1);
         break;
-      case 's': // Don't use the TAO Naming Service.
-        this->use_naming_service_=0;
-        break;
+
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -50,17 +48,18 @@ NestedUpCalls_Server::parse_args (void)
 
 int
 NestedUpCalls_Server::init (int argc,
-                    char** argv,
-                    CORBA::Environment& env)
+                            char* argv[],
+                            CORBA::Environment& ACE_TRY_ENV)
 {
   // Call the init of TAO_ORB_Manager to create a child POA
   // under the root POA.
   this->orb_manager_.init_child_poa (argc,
                                      argv,
                                      "child_poa",
-                                     env);
+                                     ACE_TRY_ENV);
+
+  ACE_CHECK_RETURN (-1);
 
-  TAO_CHECK_ENV_RETURN (env,-1);
   this->argc_ = argc;
   this->argv_ = argv;
 
@@ -70,7 +69,9 @@ NestedUpCalls_Server::init (int argc,
   CORBA::String_var str  =
     this->orb_manager_.activate_under_child_poa ("reactor",
                                                  &this->reactor_impl_,
-                                                 env);
+                                                 ACE_TRY_ENV);
+  ACE_CHECK_RETURN (-1);
+
   ACE_DEBUG ((LM_DEBUG,
               "The IOR is: <%s>\n",
               str.in ()));
@@ -83,56 +84,13 @@ NestedUpCalls_Server::init (int argc,
       ACE_OS::fclose (this->ior_output_file_);
     }
 
-  if (this->use_naming_service_)
-    return this->init_naming_service (env);
-
-  return 0;
-}
-
-// Initialisation of Naming Service and register IDL_Cubit Context and
-// cubit_factory object.
-
-int
-NestedUpCalls_Server::init_naming_service (CORBA::Environment& env)
-{
-  int result;
-  CORBA::ORB_var orb;
-  PortableServer::POA_var child_poa;
-
-  orb = this->orb_manager_.orb ();
-  child_poa = this->orb_manager_.child_poa ();
-
-  result = this->my_name_server_.init (orb.in (),
-                                       child_poa.in ());
-  if (result < 0)
-    return result;
-  reactor_ = this->reactor_impl_._this (env);
-  TAO_CHECK_ENV_RETURN (env,-1);
-
-  //Register the nested_up_calls_reactor name with the NestedUpCalls Naming
-  //Context...
-  CosNaming::Name nested_up_calls_context_name (1);
-  nested_up_calls_context_name.length (1);
-  nested_up_calls_context_name[0].id = CORBA::string_dup ("NestedUpCalls");
-  this->naming_context_ =
-    this->my_name_server_->bind_new_context (nested_up_calls_context_name,
-                                             env);
-  TAO_CHECK_ENV_RETURN (env,-1);
-
-  CosNaming::Name reactor_name (1);
-  reactor_name.length (1);
-  reactor_name[0].id = CORBA::string_dup ("nested_up_calls_reactor");
-  this->naming_context_->bind (reactor_name,
-                                                           reactor_.in (),
-                                           env);
-  TAO_CHECK_ENV_RETURN (env,-1);
   return 0;
 }
 
 int
-NestedUpCalls_Server::run (CORBA::Environment& env)
+NestedUpCalls_Server::run (CORBA::Environment& ACE_TRY_ENV)
 {
-  if (this->orb_manager_.run (env) == -1)
+  if (this->orb_manager_.run (ACE_TRY_ENV) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "NestedUpCalls_Server::run"),
                       -1);
@@ -150,28 +108,29 @@ main (int argc, char *argv[])
 
   ACE_DEBUG ((LM_DEBUG,
               "\n \t NestedUpCalls:SERVER \n \n"));
-  TAO_TRY
+
+  ACE_TRY_NEW_ENV
     {
-      if (nested_up_calls_server.init (argc,argv,TAO_TRY_ENV) == -1)
+      if (nested_up_calls_server.init (argc,argv,
+                                       ACE_TRY_ENV) == -1)
         return 1;
-      else
-        {
-          nested_up_calls_server.run (TAO_TRY_ENV);
-          TAO_CHECK_ENV;
-        }
+
+      ACE_TRY_CHECK;
+
+      nested_up_calls_server.run (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
     }
-  TAO_CATCH (CORBA::SystemException, sysex)
+  ACE_CATCH (CORBA::SystemException, sysex)
     {
-      ACE_UNUSED_ARG (sysex);
-      TAO_TRY_ENV.print_exception ("System Exception");
-      return -1;
+      ACE_PRINT_EXCEPTION (sysex, "System Exception");
+      return 1;
     }
-  TAO_CATCH (CORBA::UserException, userex)
+  ACE_CATCH (CORBA::UserException, userex)
     {
-      ACE_UNUSED_ARG (userex);
-      TAO_TRY_ENV.print_exception ("User Exception");
-      return -1;
+      ACE_PRINT_EXCEPTION (userex, "User Exception");
+      return 1;
     }
-  TAO_ENDTRY;
+  ACE_ENDTRY;
+
   return 0;
 }