[Jifty-commit] r6603 - in jifty/trunk: lib/Jifty

[Jifty commits]

Author: alexmv
Date: Tue Mar 17 10:57:12 2009
New Revision: 6603

Modified:
   jifty/trunk/   (props changed)
   jifty/trunk/lib/Jifty/Dispatcher.pm

Log:
 r43242 at kohr-ah:  chmrr | 2009-03-17 10:14:04 -0400
 Fixes for mason abort not spewing warnings everywhere


Modified: jifty/trunk/lib/Jifty/Dispatcher.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Dispatcher.pm	(original)
+++ jifty/trunk/lib/Jifty/Dispatcher.pm	Tue Mar 17 10:57:12 2009
@@ -1255,8 +1255,8 @@
 
     # Handle parse errors
     my $err = $@;
-    $self->log->fatal("View error: $err") if $err;
     if ( $err and not eval { $err->isa('HTML::Mason::Exception::Abort') } ) {
+        $self->log->fatal("View error: $err") if $err;
         if ($template eq '/errors/500') {
             $self->log->warn("Can't render internal_error: $err");
             # XXX Built-in static "oh noes" page?
@@ -1279,9 +1279,8 @@
         Jifty->web->_redirect( "/errors/500?J:C=" . $c->id );
     } elsif ($err) {
         Jifty->handler->buffer->pop while Jifty->handler->buffer->depth > $start_depth;
-        die $err;
+        $self->_abort;
     }
-
 }