ChangeLogTag: Wed Mar 28 16:27:42 2001 Balachandran Natarajan <bala@cs.wustl.edu>

3 files changed, 9 insertions, 5 deletions

diff --git a/TAO/orbsvcs/Time_Service/Clerk_i.cpp b/TAO/orbsvcs/Time_Service/Clerk_i.cpp
index 3090fa34f70..34dece01cc1 100644
--- a/TAO/orbsvcs/Time_Service/Clerk_i.cpp
+++ b/TAO/orbsvcs/Time_Service/Clerk_i.cpp
@@ -309,8 +309,10 @@ Clerk_i::next_n_IORs (CosNaming::BindingIterator_var iter,
 // Initialise the Naming Service.
 
 int
-Clerk_i::init_naming_service (CORBA::Environment &ACE_TRY_ENV)
+Clerk_i::init_naming_service (void)
 {
+  ACE_DECLARE_NEW_CORBA_ENV;
+
   ACE_TRY
     {
       // Initialize the POA.
@@ -531,7 +533,7 @@ Clerk_i::init (int argc,
                       "IOR file not specified. Using the Naming Service instead\n"));
 
           // Initialize the Naming Service.
-          if (this->init_naming_service (ACE_TRY_ENV) !=0 )
+          if (this->init_naming_service () !=0 )
             return -1;
 
           // Get a reference to the Server Naming context and the
diff --git a/TAO/orbsvcs/Time_Service/Clerk_i.h b/TAO/orbsvcs/Time_Service/Clerk_i.h
index 65cfabfa2f0..03451f8de23 100644
--- a/TAO/orbsvcs/Time_Service/Clerk_i.h
+++ b/TAO/orbsvcs/Time_Service/Clerk_i.h
@@ -77,7 +77,7 @@ private:
   FILE *ior_output_file_;
   // File where the IOR of the Clerk object is stored.
 
-  int init_naming_service (CORBA::Environment &env);
+  int init_naming_service (void);
   // Initialises the name server and registers the <TimeService> Clerk
   // object with it.
 
diff --git a/TAO/orbsvcs/Time_Service/Server_i.cpp b/TAO/orbsvcs/Time_Service/Server_i.cpp
index 5aa62b8023c..5716e4c51fb 100644
--- a/TAO/orbsvcs/Time_Service/Server_i.cpp
+++ b/TAO/orbsvcs/Time_Service/Server_i.cpp
@@ -328,10 +328,12 @@ Server_i::init (int argc,
 int
 Server_i::run (CORBA::Environment &ACE_TRY_ENV)
 {
-  if (this->orb_manager_.run (ACE_TRY_ENV) == -1)
+  int retval = this->orb_manager_.run (ACE_TRY_ENV);
+  ACE_CHECK_RETURN (-1);
+
+  if (retval == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "[SERVER] Process/Thread Id : (%P/%t) Server_i::run"),
                       -1);
-  ACE_CHECK_RETURN (0);
   return 0;
 }