Merge branch 'hotfix/3215' into develop

Close zendframework#3215
AntonStoeckl · Dec 13, 2012 · 607d268 · 607d268
2 parents 0c0703d + abd9c1e
commit 607d268
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/library/Zend/Test/PHPUnit/Controller/AbstractControllerTestCase.php b/library/Zend/Test/PHPUnit/Controller/AbstractControllerTestCase.php
@@ -246,7 +246,7 @@ public function dispatch($url, $method = HttpRequest::METHOD_GET, $params = arra
         }
 
         $exception = $this->getApplication()->getMvcEvent()->getParam('exception');
-        if ($exception) {
+        if ($exception instanceof \Exception) {
             throw $exception;
         }
     }