From 572f728153f9415161542206a7d6a095e82c719b Mon Sep 17 00:00:00 2001
From: romanb <romanb@625475ce-881a-0410-a577-b389adb331d8>
Date: Thu, 21 Jan 2010 22:25:42 +0000
Subject: [PATCH] [2.0][DDC-260] Fixed/Corrected patch.

---
 lib/Doctrine/ORM/Mapping/ClassMetadata.php    | 60 +++++++------------
 .../ORM/Mapping/ClassMetadataFactory.php      |  6 +-
 2 files changed, 25 insertions(+), 41 deletions(-)

diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadata.php b/lib/Doctrine/ORM/Mapping/ClassMetadata.php
index 011c75071..943987b95 100644
--- a/lib/Doctrine/ORM/Mapping/ClassMetadata.php
+++ b/lib/Doctrine/ORM/Mapping/ClassMetadata.php
@@ -144,14 +144,9 @@ class ClassMetadata extends ClassMetadataInfo
         parent::_validateAndCompleteFieldMapping($mapping);
 
         // Store ReflectionProperty of mapped field
-        try {
-            $refProp = $this->reflClass->getProperty($mapping['fieldName']);
-            $refProp->setAccessible(true);
-            $this->reflFields[$mapping['fieldName']] = $refProp;
-        }
-        catch(\ReflectionException $e) { 
-        	throw MappingException::reflectionFailure($this->name, $e);
-        }
+        $refProp = $this->reflClass->getProperty($mapping['fieldName']);
+        $refProp->setAccessible(true);
+        $this->reflFields[$mapping['fieldName']] = $refProp;
     }
 
     /**
@@ -242,14 +237,9 @@ class ClassMetadata extends ClassMetadataInfo
         // Store ReflectionProperty of mapped field
         $sourceFieldName = $assocMapping->sourceFieldName;
         
-        try {
-	        $refProp = $this->reflClass->getProperty($sourceFieldName);
-	        $refProp->setAccessible(true);
-	        $this->reflFields[$sourceFieldName] = $refProp;
-        }
-        catch(\ReflectionException $e) { 
-            throw MappingException::reflectionFailure($this->name, $e);
-        }
+	    $refProp = $this->reflClass->getProperty($sourceFieldName);
+	    $refProp->setAccessible(true);
+	    $this->reflFields[$sourceFieldName] = $refProp;
     }
     
     /**
@@ -352,11 +342,9 @@ class ClassMetadata extends ClassMetadataInfo
             'isVersioned',
             'lifecycleCallbacks',
             'name',
-            //'namespace',
             'parentClasses',
             'primaryTable',
             'rootEntityName',
-            //'sequenceGeneratorDefinition',
             'subClasses',
             'versionField'
         );
@@ -373,33 +361,25 @@ class ClassMetadata extends ClassMetadataInfo
         $this->reflClass = new \ReflectionClass($this->name);
         
         foreach ($this->fieldMappings as $field => $mapping) {
-            try {
-	            if (isset($mapping['inherited'])) {
-	                $reflField = new \ReflectionProperty($mapping['inherited'], $field);
-	            } else {
-	                $reflField = $this->reflClass->getProperty($field);
-	            }
+	        if (isset($mapping['inherited'])) {
+	            $reflField = new \ReflectionProperty($mapping['inherited'], $field);
+	        } else {
+	            $reflField = $this->reflClass->getProperty($field);
+	        }
 	            
-	            $reflField->setAccessible(true);
-                $this->reflFields[$field] = $reflField;
-            } catch(\ReflectionException $e) { 
-                throw MappingException::reflectionFailure($this->name, $e);
-            }
+            $reflField->setAccessible(true);
+            $this->reflFields[$field] = $reflField;
         }
         
         foreach ($this->associationMappings as $field => $mapping) {
-            try {
-                if (isset($this->inheritedAssociationFields[$field])) {
-                    $reflField = new \ReflectionProperty($this->inheritedAssociationFields[$field], $field);
-                } else {
-                    $reflField = $this->reflClass->getProperty($field);
-                }
+            if (isset($this->inheritedAssociationFields[$field])) {
+                $reflField = new \ReflectionProperty($this->inheritedAssociationFields[$field], $field);
+            } else {
+                $reflField = $this->reflClass->getProperty($field);
+            }
                 
-                $reflField->setAccessible(true);
-                $this->reflFields[$field] = $reflField;
-            } catch(\ReflectionException $e) { 
-                throw MappingException::reflectionFailure($this->name, $e);
-            } 
+            $reflField->setAccessible(true);
+            $this->reflFields[$field] = $reflField;
         }
         
         //$this->prototype = unserialize(sprintf('O:%d:"%s":0:{}', strlen($this->name), $this->name));
diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php b/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
index 55330d9d4..5594e38ea 100644
--- a/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
+++ b/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
@@ -222,7 +222,11 @@ class ClassMetadataFactory
             }
 
             // Invoke driver
-            $this->_driver->loadMetadataForClass($className, $class);
+            try {
+                $this->_driver->loadMetadataForClass($className, $class);
+            } catch(\ReflectionException $e) { 
+                throw MappingException::reflectionFailure($className, $e);
+            }
 
             // Verify & complete identifier mapping
             if ( ! $class->identifier && ! $class->isMappedSuperclass) {