X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst.pm;h=b6196354fb4129f372f25f3f46ca9a9c0fabc5b3;hb=88879e92d58519c320438f8440a68d1648f4c099;hp=c3b59b96d21e4ad3662ff412605fa4c447ec9cae;hpb=fbb513f774337d5b48768491f0479b2b24e7fc4c;p=catagits%2FCatalyst-Runtime.git diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm index c3b59b9..b619635 100644 --- a/lib/Catalyst.pm +++ b/lib/Catalyst.pm @@ -61,7 +61,7 @@ __PACKAGE__->response_class('Catalyst::Response'); # Remember to update this in Catalyst::Runtime as well! -our $VERSION = '5.7000'; +our $VERSION = '5.7001'; sub import { my ( $class, @arguments ) = @_; @@ -1147,7 +1147,7 @@ sub execute { my $last = pop( @{ $c->stack } ); if ( my $error = $@ ) { - if ( $error eq $DETACH ) { die $DETACH if $c->depth > 1 } + if ( !ref($error) and $error eq $DETACH ) { die $DETACH if $c->depth > 1 } else { unless ( ref $error ) { no warnings 'uninitialized';