From 43f8398fbb999569fdf294169dea3f4dec65d6d8 Mon Sep 17 00:00:00 2001
From: Benjamin Eberlei <kontakt@beberlei.de>
Date: Fri, 27 Aug 2010 22:21:18 +0200
Subject: [PATCH] DDC-770 - Commit missing changes to XmlDriver and YamlDriver

---
 lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php  | 4 ----
 lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php b/lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php
index 3a95ca52c..7ffcd0001 100644
--- a/lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php
+++ b/lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php
@@ -87,8 +87,6 @@ class XmlDriver extends AbstractFileDriver
                         'type' => (string)$discrColumn['type'],
                         'length' => (string)$discrColumn['length']
                     ));
-                } else {
-                    throw MappingException::missingDiscriminatorColumn($className);
                 }
 
                 // Evaluate <discriminator-map...>
@@ -98,8 +96,6 @@ class XmlDriver extends AbstractFileDriver
                         $map[(string)$discrMapElement['value']] = (string)$discrMapElement['class'];
                     }
                     $metadata->setDiscriminatorMap($map);
-                } else {
-                    throw MappingException::missingDiscriminatorMap($className);
                 }
             }
         }
diff --git a/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php b/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php
index bcf21f04a..21130c349 100644
--- a/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php
+++ b/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php
@@ -79,15 +79,11 @@ class YamlDriver extends AbstractFileDriver
                         'type' => $discrColumn['type'],
                         'length' => $discrColumn['length']
                     ));
-                } else {
-                    throw MappingException::missingDiscriminatorColumn($className);
                 }
 
                 // Evaluate discriminatorMap
                 if (isset($element['discriminatorMap'])) {
                     $metadata->setDiscriminatorMap($element['discriminatorMap']);
-                } else {
-                    throw MappingException::missingDiscriminatorMap($className);
                 }
             }
         }