From 82c416686e8146145dd6dd8ad9551a0bc00b8833 Mon Sep 17 00:00:00 2001
From: piccoloprincipe <piccoloprincipe@625475ce-881a-0410-a577-b389adb331d8>
Date: Tue, 28 Jul 2009 12:30:35 +0000
Subject: [PATCH] [2.0] resolved hydrateAdd() recursivity

---
 lib/Doctrine/ORM/PersistentCollection.php              | 10 ++++------
 .../ManyToManyBidirectionalAssociationTest.php         |  2 +-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/lib/Doctrine/ORM/PersistentCollection.php b/lib/Doctrine/ORM/PersistentCollection.php
index 1c3432666..5f22a5316 100644
--- a/lib/Doctrine/ORM/PersistentCollection.php
+++ b/lib/Doctrine/ORM/PersistentCollection.php
@@ -203,13 +203,10 @@ final class PersistentCollection extends \Doctrine\Common\Collections\Collection
      * 
      * @param mixed $element The element to add.
      */
-    public function hydrateAdd($element)
+    public function hydrateAdd($element, $setBackRef = true)
     {
-        if (parent::contains($element)) {
-            return;
-        }
         parent::add($element);
-        if ($this->_backRefFieldName) {
+        if ($this->_backRefFieldName and $setBackRef) {
             // Set back reference to owner
             if ($this->_association->isOneToMany()) {
                 // OneToMany
@@ -219,7 +216,7 @@ final class PersistentCollection extends \Doctrine\Common\Collections\Collection
                 // ManyToMany
                 $otherCollection = $this->_typeClass->reflFields[$this->_backRefFieldName]
                         ->getValue($element);
-                $otherCollection->hydrateAdd($this->_owner);
+                $otherCollection->hydrateAdd($this->_owner, false);
             }
         }
     }
@@ -242,6 +239,7 @@ final class PersistentCollection extends \Doctrine\Common\Collections\Collection
     private function _initialize()
     {
         if (!$this->_initialized) {
+            parent::clear();
             $this->_association->load($this->_owner, $this, $this->_em);
             $this->_initialized = true;
         }
diff --git a/tests/Doctrine/Tests/ORM/Functional/ManyToManyBidirectionalAssociationTest.php b/tests/Doctrine/Tests/ORM/Functional/ManyToManyBidirectionalAssociationTest.php
index 4438f9c5c..0122e4596 100644
--- a/tests/Doctrine/Tests/ORM/Functional/ManyToManyBidirectionalAssociationTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/ManyToManyBidirectionalAssociationTest.php
@@ -134,7 +134,7 @@ class ManyToManyBidirectionalAssociationTest extends AbstractManyToManyAssociati
         $categories = $firstProduct->getCategories();        
         $firstCategoryProducts = $categories[0]->getProducts();
         $secondCategoryProducts = $categories[1]->getProducts();
-        
+
         $this->assertEquals(2, count($firstCategoryProducts));
         $this->assertEquals(2, count($secondCategoryProducts));