[DoctrineBundle] fixed non-working safe-guards (closes #1129)

symfony · Jun 5, 2011 · 9d18b38 · 9d18b38
1 parent 8457bfa
commit 9d18b38
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/Symfony/Bundle/DoctrineBundle/Mapping/MetadataFactory.php b/src/Symfony/Bundle/DoctrineBundle/Mapping/MetadataFactory.php
@@ -48,7 +48,8 @@ public function __construct(Registry $registry)
     public function getBundleMetadata(BundleInterface $bundle)
     {
         $namespace = $bundle->getNamespace();
-        if (!$metadata = $this->getMetadataForNamespace($namespace)) {
+        $metadata = $this->getMetadataForNamespace($namespace);
+        if (!$metadata->getMetadata()) {
             throw new \RuntimeException(sprintf('Bundle "%s" does not contain any mapped entities.', $bundle->getName()));
         }
 
@@ -70,7 +71,8 @@ public function getBundleMetadata(BundleInterface $bundle)
      */
     public function getClassMetadata($class, $path = null)
     {
-        if (!$metadata = $this->getMetadataForClass($class)) {
+        $metadata = $this->getMetadataForClass($class);
+        if (!$metadata->getMetadata()) {
             throw new \RuntimeException(sprintf('Entity "%s" is not a mapped entity.', $class));
         }
 
@@ -98,7 +100,8 @@ public function getClassMetadata($class, $path = null)
      */
     public function getNamespaceMetadata($namespace, $path = null)
     {
-        if (!$metadata = $this->getMetadataForNamespace($namespace)) {
+        $metadata = $this->getMetadataForNamespace($namespace);
+        if (!$metadata->getMetadata()) {
             throw new \RuntimeException(sprintf('Namespace "%s" does not contain any mapped entities.', $namespace));
         }