diff options
-rw-r--r-- | TAO/orbsvcs/Time_Service/Server_i.cpp | 12 | ||||
-rw-r--r-- | TAO/orbsvcs/Time_Service/Server_i.h | 4 |
2 files changed, 10 insertions, 6 deletions
diff --git a/TAO/orbsvcs/Time_Service/Server_i.cpp b/TAO/orbsvcs/Time_Service/Server_i.cpp index 37cc3b29e7e..87d54756178 100644 --- a/TAO/orbsvcs/Time_Service/Server_i.cpp +++ b/TAO/orbsvcs/Time_Service/Server_i.cpp @@ -109,6 +109,7 @@ Server_i::init_naming_service (CORBA::Environment& env) } // Initialize the Implementation Repository. + /* int Server_i::init_IR (void) @@ -155,7 +156,7 @@ Server_i::init_IR (void) ACE_OS::fclose (this->ior_output_file_); } - } + } TAO_CATCHANY { TAO_TRY_ENV.print_exception ("Exception:"); @@ -383,7 +384,7 @@ Server_i::init (int argc, this->create_server (); // Initialize the IR. - // this->init_IR (); + this->init_IR (); // Register the server object with the Naming Service. // ??this->register_server (); @@ -405,23 +406,26 @@ Server_i::run (CORBA::Environment &env) { TAO_TRY { + /* if (this->use_ir_ == 1) { this->ir_helper_->notify_startup (TAO_TRY_ENV); TAO_CHECK_ENV; } - + */ // Run the main event loop for the ORB. if (this->orb_manager_.run (TAO_TRY_ENV) == -1) ACE_ERROR_RETURN ((LM_ERROR, "[SERVER] Process/Thread Id : (%P/%t) Server_i::run"), -1); - + /* if (this->use_ir_ == 1) { this->ir_helper_->notify_shutdown (TAO_TRY_ENV); TAO_CHECK_ENV; } + */ + } TAO_CATCHANY { diff --git a/TAO/orbsvcs/Time_Service/Server_i.h b/TAO/orbsvcs/Time_Service/Server_i.h index 9d996a2afb2..01f3dfe8130 100644 --- a/TAO/orbsvcs/Time_Service/Server_i.h +++ b/TAO/orbsvcs/Time_Service/Server_i.h @@ -24,7 +24,7 @@ #include "orbsvcs/Naming/Naming_Utils.h" #include "orbsvcs/Time/TAO_Time_Service_Server.h" -#include "IR_Helper.h" +//#include "IR_Helper.h" class Server_i { @@ -91,7 +91,7 @@ private: CosNaming::NamingContext_var time_service_server_context_; // Naming context for the Naming Service. - IR_Helper *ir_helper_; + // IR_Helper *ir_helper_; // The Implementation Repository Helper. int use_ir_; |