ChangeLogTag: Tue Jan 8 10:11:48 UTC 2008 Vladimir Zykov <vladimir.zykov@prismtech.com>

4 files changed, 60 insertions, 2 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 43b1aeb81eb..714c10f101c 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,12 @@
+Tue Jan  8 10:11:48 UTC 2008  Vladimir Zykov  <vladimir.zykov@prismtech.com>
+
+        * tao/PortableServer/Active_Policy_Strategies.inl:
+        * tao/PortableServer/Active_Policy_Strategies.h:
+        * tao/PortableServer/Root_POA.cpp:
+          Fixed bug 3184 which was about leaks of POA manager and strategies
+          in active_policy_strategies_ inside TAO_Root_POA constructor in
+          case if exception is thrown in that constructor.
+
 Mon Jan  7 15:43:12 UTC 2008  Martin Corino <mcorino@remedy.nl>
 
         * tao/DynamicInterface/DII_Invocation_Adapter.cpp:
diff --git a/TAO/tao/PortableServer/Active_Policy_Strategies.h b/TAO/tao/PortableServer/Active_Policy_Strategies.h
index 16cec7c1071..b5f2cac656c 100644
--- a/TAO/tao/PortableServer/Active_Policy_Strategies.h
+++ b/TAO/tao/PortableServer/Active_Policy_Strategies.h
@@ -91,6 +91,22 @@ namespace TAO
       IdUniquenessStrategyFactory *id_uniqueness_strategy_factory_;
       IdAssignmentStrategyFactory *id_assignment_strategy_factory_;
     };
+
+    /**
+     * This class quards the cleanup of strategies if something went wrong
+     * in the code that called Active_Policy_Strategies::update().
+     */
+    class Active_Policy_Strategies_Cleanup_Guard
+    {
+    public:
+      Active_Policy_Strategies_Cleanup_Guard (Active_Policy_Strategies *p);
+      ~Active_Policy_Strategies_Cleanup_Guard (void);
+
+      Active_Policy_Strategies *_retn (void);
+
+    private:
+      Active_Policy_Strategies *ptr_;
+    };
   }
 }
 
diff --git a/TAO/tao/PortableServer/Active_Policy_Strategies.inl b/TAO/tao/PortableServer/Active_Policy_Strategies.inl
index ab606b04b1a..5050cfe8cbe 100644
--- a/TAO/tao/PortableServer/Active_Policy_Strategies.inl
+++ b/TAO/tao/PortableServer/Active_Policy_Strategies.inl
@@ -56,6 +56,32 @@ namespace TAO
     {
       return this->servant_retention_strategy_;
     }
+
+    ACE_INLINE
+    Active_Policy_Strategies_Cleanup_Guard
+      ::Active_Policy_Strategies_Cleanup_Guard (Active_Policy_Strategies *p)
+      : ptr_ (p)
+    {
+    }
+
+    ACE_INLINE
+    Active_Policy_Strategies_Cleanup_Guard
+      ::~Active_Policy_Strategies_Cleanup_Guard (void)
+    {
+      if (this->ptr_)
+        {
+          this->ptr_->cleanup ();
+        }
+    }
+
+    ACE_INLINE
+    Active_Policy_Strategies *
+    Active_Policy_Strategies_Cleanup_Guard::_retn (void)
+    {
+      Active_Policy_Strategies *temp = this->ptr_;
+      this->ptr_ = 0;
+      return temp;
+    }
   }
 }
 
diff --git a/TAO/tao/PortableServer/Root_POA.cpp b/TAO/tao/PortableServer/Root_POA.cpp
index eeeaea055d4..02932633fa4 100644
--- a/TAO/tao/PortableServer/Root_POA.cpp
+++ b/TAO/tao/PortableServer/Root_POA.cpp
@@ -231,8 +231,9 @@ TAO_Root_POA::TAO_Root_POA (const TAO_Root_POA::String &name,
     servant_for_key_to_object_ (0)
 {
   // Since we are keeping a reference to a POAManager, we need to
-  // increment the reference count
-  this->poa_manager_._add_ref();
+  // increment the reference count but we do this safely.
+  PortableServer::POAManager_var pm_guard (
+    PortableServer::POAManager::_duplicate(&this->poa_manager_));
 
   // Parse the policies that are used in the critical path in
   // a cache.
@@ -268,6 +269,8 @@ TAO_Root_POA::TAO_Root_POA (const TAO_Root_POA::String &name,
   // Set the active strategies to be used by this POA
   this->active_policy_strategies_.update (this->cached_policies_,
                                           this);
+  TAO::Portable_Server::Active_Policy_Strategies_Cleanup_Guard aps_cleanup_guard (
+    &this->active_policy_strategies_);
 
   // Set the folded name of this POA.
   this->set_folded_name (parent);
@@ -309,6 +312,10 @@ TAO_Root_POA::TAO_Root_POA (const TAO_Root_POA::String &name,
                                           this->system_name_.in ());
       throw;
     }
+
+  // Now when everything is fine we can release the quards.
+  pm_guard._retn ();
+  aps_cleanup_guard._retn ();
 }
 
 TAO_Root_POA::~TAO_Root_POA (void)