From b1d7a057fd1825cd1aee0434567c3310a6aaeb23 Mon Sep 17 00:00:00 2001
From: Marco Pivetta <ocramius@gmail.com>
Date: Sun, 18 Jan 2015 01:05:36 +0100
Subject: [PATCH] #1228 DDC-3490 - avoid catching unknown exceptions, remove
 unused method call

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

diff --git a/lib/Doctrine/ORM/UnitOfWork.php b/lib/Doctrine/ORM/UnitOfWork.php
index 9764a6eca..32e4b8603 100644
--- a/lib/Doctrine/ORM/UnitOfWork.php
+++ b/lib/Doctrine/ORM/UnitOfWork.php
@@ -728,11 +728,7 @@ class UnitOfWork implements PropertyChangedListener
                 continue;
             }
 
-            try {
-                $this->computeAssociationChanges($assoc, $val);
-            } catch (\Exception $ex) {
-                throw ORMInvalidArgumentException::computeAssociationChangesError($entity, $assoc['fieldName'], $val);
-            }
+            $this->computeAssociationChanges($assoc, $val);
 
             if ( ! isset($this->entityChangeSets[$oid]) &&
                 $assoc['isOwningSide'] &&
@@ -2203,9 +2199,7 @@ class UnitOfWork implements PropertyChangedListener
                     break;
 
                 case ($relatedEntities !== null):
-                    $targetClass = $this->em->getClassMetadata($assoc['targetEntity'])->name;
-
-                    if (! $relatedEntities instanceof $targetClass) {
+                    if (! $relatedEntities instanceof $assoc['targetEntity']) {
                         throw ORMInvalidArgumentException::invalidAssociation(
                             $this->em->getClassMetadata($assoc['targetEntity']),
                             $assoc,