Applications should terminate due to an uncatched exception

diff --git a/application/selector/exceptions.php b/application/selector/exceptions.php
index fd41c37727663bfd3d5e82c4f31870119eaa3f99..e332850a2674a18fddfe9f756e0204d2562cdbba 100644 (file)
--- a/application/selector/exceptions.php
+++ b/application/selector/exceptions.php
@@ -25,7 +25,7 @@
 // Our own exception handler
 function __exceptionHandler (FrameworkException $e) {
        // Call the app_die() method
-       ApplicationEntryPoint::app_die(sprintf("[Main:] The application <span class=\"app_name\">%s</span> (<span class=\"app_short_name\">%s</span>) has terminated due to a thrown exception: <span class=\"exception_name\">%s</span> <span class=\"exception_number\">[%s]</span>: <span class=\"debug_exception\">%s</span> Backtrace: <div class=\"debug_backtrace\">%s</div>",
+       ApplicationEntryPoint::app_die(sprintf("[Main:] The application <span class=\"app_name\">%s</span> (<span class=\"app_short_name\">%s</span>) has terminated due to an uncatched exception: <span class=\"exception_name\">%s</span> <span class=\"exception_number\">[%s]</span>: <span class=\"debug_exception\">%s</span> Backtrace: <div class=\"debug_backtrace\">%s</div>",
                ApplicationHelper::getInstance()->getAppName(),
                ApplicationHelper::getInstance()->getAppShortName(),
                $e->__toString(),

diff --git a/application/selector/starter.php b/application/selector/starter.php
index dde690e85cea772656dbd443f3edcd612810461b..64ac8075dc755f783b0751adfdee813d7d8d8209 100644 (file)
--- a/application/selector/starter.php
+++ b/application/selector/starter.php
@@ -47,18 +47,7 @@ if ((empty($app)) || (is_null($app))) {
 }
 
 // Call the entry point method
-try {
-       // Call user function
-       call_user_func_array(array($app, FrameworkConfiguration::getInstance()->readConfig('entry_method')), array());
-} catch (FrameworkException $e) {
-       die($e->getMessage());
-       ApplicationEntryPoint::app_die(sprintf("[Main:] The application <span class=\"app_name\">%s</span> has been terminated due to a thrown exception: <strong>%s - %s</strong>",
-               $application,
-               $e->__toString(),
-               $e->getMessage()
-       ));
-}
-
+call_user_func_array(array($app, FrameworkConfiguration::getInstance()->readConfig('entry_method')), array());
 
 // [EOF]
 ?>

diff --git a/application/ship-simu/exceptions.php b/application/ship-simu/exceptions.php
index fd41c37727663bfd3d5e82c4f31870119eaa3f99..e332850a2674a18fddfe9f756e0204d2562cdbba 100644 (file)
--- a/application/ship-simu/exceptions.php
+++ b/application/ship-simu/exceptions.php
@@ -25,7 +25,7 @@
 // Our own exception handler
 function __exceptionHandler (FrameworkException $e) {
        // Call the app_die() method
-       ApplicationEntryPoint::app_die(sprintf("[Main:] The application <span class=\"app_name\">%s</span> (<span class=\"app_short_name\">%s</span>) has terminated due to a thrown exception: <span class=\"exception_name\">%s</span> <span class=\"exception_number\">[%s]</span>: <span class=\"debug_exception\">%s</span> Backtrace: <div class=\"debug_backtrace\">%s</div>",
+       ApplicationEntryPoint::app_die(sprintf("[Main:] The application <span class=\"app_name\">%s</span> (<span class=\"app_short_name\">%s</span>) has terminated due to an uncatched exception: <span class=\"exception_name\">%s</span> <span class=\"exception_number\">[%s]</span>: <span class=\"debug_exception\">%s</span> Backtrace: <div class=\"debug_backtrace\">%s</div>",
                ApplicationHelper::getInstance()->getAppName(),
                ApplicationHelper::getInstance()->getAppShortName(),
                $e->__toString(),