0
@@ -115,22 +115,6 @@ class midcom_exception_notfound extends Exception
0
     }
0
 }
0
 
0
-class midcom_exception_allroutesfailed extends Exception
0
-{
0
-    // FIXME: Some more elegant way to output the worst failure
0
-    // Redefine the exception so message isn't optional
0
-    public function __construct($message, $code = 500) 
0
-    {
0
-        $string = ("Exception message stack");
0
-        foreach($message as $m)
0
-        {
0
-            $string .= "{$m->message}\n"; 
0
-        }
0
-        $message = $string;
0
-        parent::__construct($message, $code);
0
-    }
0
-}
0
-
0
 /**
0
  * MidCOM 3 "unauthorized" exception
0
  *

0
@@ -246,7 +246,19 @@ class midcom_core_services_dispatcher_midgard implements midcom_core_services_di
0
             /** 
0
               * @Todo: Dump better output if all routematches fail to handle
0
               */
0
-            throw new midcom_exception_allroutesfailed(&$this->exceptions_stack);
0
+            foreach ($this->exceptions_stack as $exception)
0
+            {
0
+                switch (get_class($exception))
0
+                {
0
+                    case 'midcom_exception_unauthorized':
0
+                        throw $exception;
0
+                        // This will exit
0
+                    case 'midcom_exception_httperror':
0
+                        throw $exception;
0
+                        // This will exit
0
+                }
0
+            }
0
+            throw new midcom_exception_notfound("No route matches");
0
         }
0
     }
0