*** empty log message ***

2 files changed, 20 insertions, 2 deletions

diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp
index 70df83bbfc5..caaf5b2c741 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp
@@ -6,7 +6,8 @@
 #include "TAO_Time_Service_Server.h"
 
 // Constructor.
-TAO_Time_Service_Server::TAO_Time_Service_Server (void)
+TAO_Time_Service_Server::TAO_Time_Service_Server (int shutdown)
+  : shutdown_ (shutdown)
 {
 }
 
@@ -31,7 +32,20 @@ TAO_Time_Service_Server::universal_time (CORBA::Environment &_env)
 			CORBA::NO_MEMORY (CORBA::COMPLETED_NO),
 			CosTime::UTO::_nil ());
 
+  ACE_DEBUG ((LM_DEBUG,
+	      "Returning a UTO\n"));
+
   return uto->_this ();
+
+  // In case we are using the IR.
+  //   if (this->shutdown_ != 0)
+  //       {
+  // 	TAO_ORB_Core_instance ()->orb ()->shutdown ();
+
+  // 	ACE_DEBUG ((LM_DEBUG,
+  // 		    "Shutting down the ORB\n"));
+  //       }
+
 }
 
 // This method returns the current time in a UTO only if the time can
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h
index e9dcb3267f8..bb7d0ee6297 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h
@@ -37,7 +37,7 @@ class TAO_ORBSVCS_Export TAO_Time_Service_Server : public POA_CosTime::TimeServi
 
 public:
   // = Initialization and termination methods.
-  TAO_Time_Service_Server (void);
+  TAO_Time_Service_Server (int shutdown);
   // Constructor.
 
   ~TAO_Time_Service_Server (void);
@@ -66,6 +66,10 @@ public:
 					 TimeBase::TimeT upper,
 					 CORBA::Environment &env);
   // This creates a new TIO with the given parameters.
+
+  int shutdown_;
+  // Used if the server is used with IR. If set the orb is shutdown after
+  // every method invocation.
 };
 
 #endif /* TAO_TIME_SERVICE_SERVER_H */