r9646 - helma-ng/trunk/modules/helma

[email protected] Wed, 22 Apr 2009 01:41:51 +0200 (CEST)
Newsgroups gmane.comp.java.helma.cvs
Message-ID <20090421234151.4AF1B3D0D6@mia>
Author: hannes
Date: 2009-04-22 01:41:51 +0200 (Wed, 22 Apr 2009)
New Revision: 9646

Modified:
   helma-ng/trunk/modules/helma/webapp.js
Log:
Support redirects via exceptions.

Details at http://dev.helma.org/trac/helma/changeset/9646

Modified: helma-ng/trunk/modules/helma/webapp.js
===================================================================
--- helma-ng/trunk/modules/helma/webapp.js	2009-04-21 23:41:50 UTC (rev 9645)
+++ helma-ng/trunk/modules/helma/webapp.js	2009-04-21 23:41:51 UTC (rev 9646)
@@ -124,7 +124,9 @@
     } catch (e) {
         if (e.retry) {
             throw e;
-        } else if (!e.redirect) {
+        } else if (e.redirect) {
+            return new RedirectResponse(e.redirect);
+        } else {
             // invokeMiddleware('onError', config.middleware, [req, res, e]);
             res = error(req, e);
         }
@@ -154,7 +156,7 @@
         log.debug('invoking middleware: ' + middleware);
         return module[functionName].apply(module, args);
     } catch (e) {
-        if (!e.retry) {
+        if (!e.retry && !e.redirect) {
             log.error('Error in ' + middleware + ': ' + e);
         }
         throw e;