From ddb647f39fb2dca09bd9a299bc2357ac5a730c79 Mon Sep 17 00:00:00 2001
From: Benjamin Eberlei <kontakt@beberlei.de>
Date: Sun, 5 Jun 2011 13:34:07 +0200
Subject: [PATCH] DDC-1173 - Fix bug when calling
 UnitOfWork::clearEntityChangeSet() in listener

---
 lib/Doctrine/ORM/UnitOfWork.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/Doctrine/ORM/UnitOfWork.php b/lib/Doctrine/ORM/UnitOfWork.php
index 6d9c756b4a0..8a3d582f706 100644
--- 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 */