Merge pull request doctrine#328 from Netpositive/master

addDiscriminatorMapClass fix
rdohms · Apr 7, 2012 · a1a9f85 · a1a9f85
2 parents d6ccd82 + a2fd4ec
commit a1a9f85
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php b/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
@@ -2044,7 +2044,7 @@ public function addDiscriminatorMapClass($name, $className)
             if ( ! class_exists($className)) {
                 throw MappingException::invalidClassInDiscriminatorMap($className, $this->name);
             }
-            if (is_subclass_of($className, $this->name)) {
+            if (is_subclass_of($className, $this->name) && ! in_array($className, $this->subClasses)) {
                 $this->subClasses[] = $className;
             }
         }