DDC-1173 - Fix bug when calling UnitOfWork::clearEntityChangeSet() in…

… listener
doctrine · Jun 5, 2011 · ddb647f · ddb647f · bartrail · Jul 8, 2011
1 parent 70d756d
commit ddb647f
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/lib/Doctrine/ORM/UnitOfWork.php b/lib/Doctrine/ORM/UnitOfWork.php
@@ -759,7 +759,9 @@ private function executeUpdates($class)
                     );
                 }
 
-                $persister->update($entity);
+                if ($this->entityChangeSets[$oid]) {
+                    $persister->update($entity);
+                }
                 unset($this->entityUpdates[$oid]);
 
                 if ($hasPostUpdateLifecycleCallbacks) {
@@ -2263,7 +2265,7 @@ public function registerManaged($entity, array $id, array $data)
      */
     public function clearEntityChangeSet($oid)
     {
-        unset($this->entityChangeSets[$oid]);
+        $this->entityChangeSets[$oid] = array();
     }
 
     /* PropertyChangedListener implementation */