Sat Dec 17 16:28:17 UTC 2011 Martin Corino <mcorino@remedy.nl>

        * tao/Time_Policy_Manager.cpp:

          Fix for valgrind memory leak reports.

1 files changed, 11 insertions, 14 deletions

diff --git a/TAO/tao/Time_Policy_Manager.cpp b/TAO/tao/Time_Policy_Manager.cpp
index 9223f1bd934..012463b4301 100644
--- a/TAO/tao/Time_Policy_Manager.cpp
+++ b/TAO/tao/Time_Policy_Manager.cpp
@@ -123,23 +123,20 @@ ACE_Timer_Queue * TAO_Time_Policy_Manager::create_timer_queue (void)
 void
 TAO_Time_Policy_Manager::destroy_timer_queue (ACE_Timer_Queue *tmq)
 {
-  if (this->time_policy_setting_ != TAO_OS_TIME_POLICY)
-    {
-      // locking scope
-      {
-        ACE_GUARD (TAO_SYNCH_MUTEX,
-                   monitor,
-                   this->lock_);
+  // locking scope
+  {
+    ACE_GUARD (TAO_SYNCH_MUTEX,
+                monitor,
+                this->lock_);
 
-        // check if time policy strategy has been initialized
-        if (this->time_policy_strategy_ == 0)
-          {
-            return;
-          }
+    // check if time policy strategy has been initialized
+    if (this->time_policy_strategy_ == 0)
+      {
+        return;
       }
+  }
 
-      this->time_policy_strategy_->destroy_timer_queue (tmq);
-    }
+  this->time_policy_strategy_->destroy_timer_queue (tmq);
 }