X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst.pm;h=02110edae7857254bf3d733b0bae4f7f980b0222;hb=b1ededd4680eff1d4ddb42ed860884e361804fe1;hp=3fc68c36a758f168eb75bf8a8fa22642f96327b6;hpb=1e5dad0099d51c919670c0e765615937b0fd4dae;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 3fc68c3..02110ed 100644
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -30,7 +30,7 @@ use Class::C3::Adopt::NEXT;
 use List::MoreUtils qw/uniq/;
 use attributes;
 use String::RewritePrefix;
-use Catalyst::Engine::Loader;
+use Catalyst::EngineLoader;
 use utf8;
 use Carp qw/croak carp shortmess/;
 use Try::Tiny;
@@ -1665,7 +1665,9 @@ sub execute {
     push( @{ $c->stack }, $code );
 
     no warnings 'recursion';
-    eval { $c->state( $code->execute( $class, $c, @{ $c->req->args } ) || 0 ) };
+    # N.B. This used to be combined, but I have seen $c get clobbered if so, and
+    #      I have no idea how, ergo $ret (which appears to fix the issue)
+    eval { my $ret = $code->execute( $class, $c, @{ $c->req->args } ) || 0; $c->state( $ret ) };
 
     $c->_stats_finish_execute( $stats_info ) if $c->use_stats and $stats_info;
 
@@ -2597,7 +2599,7 @@ sub engine_class {
 sub setup_engine {
     my ($class) = @_;
 
-    $class->engine_loader(Catalyst::Engine::Loader->new(application_name => $class));
+    $class->engine_loader(Catalyst::EngineLoader->new(application_name => $class));
 
     my $engine = $class->engine_class;
     Class::MOP::load_class($engine);
@@ -3235,6 +3237,8 @@ Yuval Kogman, C<nothingmuch@woobling.org>
 
 rainboxx: Matthias Dietrich, C<perl@rainboxx.de>
 
+dd070: Dhaval Dhanani <dhaval070@gmail.com>
+
 =head1 LICENSE
 
 This library is free software. You can redistribute it and/or modify it under