Browse files

DDC-1594 - Fix merge error

  • Loading branch information...
1 parent 061ea2b commit affa6feb8aa207bf74406a4dd20adad6978f0f1e @beberlei beberlei committed Feb 10, 2012
Showing with 0 additions and 5 deletions.
  1. +0 −5 lib/Doctrine/ORM/UnitOfWork.php
View
5 lib/Doctrine/ORM/UnitOfWork.php
@@ -1453,11 +1453,6 @@ private function doMerge($entity, array &$visited, $prevManagedCopy = null, $ass
} else {
throw new EntityNotFoundException;
}
-
- $managedCopy = $this->newInstance($class);
- $class->setIdentifierValues($managedCopy, $id);
-
- $this->persistNew($class, $managedCopy);
} else {
if ($managedCopy instanceof Proxy && ! $managedCopy->__isInitialized__) {
$managedCopy->__load();

0 comments on commit affa6fe

Please sign in to comment.