Merge branch 'hotfix/servicemanager_instance_check' of https://github…

….com/sasezaki/zf2
zendframework · May 26, 2012 · ea247e3 · ea247e3
3 parents 1f87514 + 8896fc2 + 32a6a82
commit ea247e3
Showing 1 changed file with 9 additions and 12 deletions.
diff --git a/src/ServiceManager.php b/src/ServiceManager.php
@@ -287,19 +287,16 @@ public function get($name, $usePeeringServiceManagers = true)
             }
         }
 
+        // Still no instance? raise an exception
         if (!$instance) {
-
-            // Still no instance? raise an exception
-            if (!$instance) {
-                throw new Exception\ServiceNotCreatedException(sprintf(
-                        '%s was unable to fetch or create an instance for %s',
-                        __METHOD__,
-                        $name
-                    ),
-                    null,
-                    ($selfException === null) ? null : $selfException->getPrevious()
-                );
-            }
+            throw new Exception\ServiceNotCreatedException(sprintf(
+                '%s was unable to fetch or create an instance for %s',
+                    __METHOD__,
+                    $name
+                ),
+                null,
+                ($selfException === null) ? null : $selfException->getPrevious()
+            );
         }
 
         if (isset($this->shared[$cName]) && $this->shared[$cName] === true) {