small optimization

mojolicious · Jun 17, 2013 · 17afad4 · 17afad4
1 parent 1b324bf
commit 17afad4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/Changes b/Changes
@@ -1,10 +1,10 @@
 
-4.15  2013-06-17
+4.15  2013-06-18
   - Improved router to make the current controller object available to actions
     as $_. (jberger, sri)
   - Fixed a few error reporting bugs in Mojo::IOLoop::Client and
     Mojo::IOLoop::Server.
-  - Fixed small chained hook bug.
+  - Fixed small emit_chain bug in Mojolicious::Plugins.
 
 4.14  2013-06-10
   - Improved url_for performance slightly.

diff --git a/lib/Mojolicious/Routes.pm b/lib/Mojolicious/Routes.pm
@@ -146,7 +146,6 @@ sub _controller {
   unless ($new = $self->_class($old, $field)) { return !!defined $new }
 
   # Application
-  my $continue;
   my $class = ref $new;
   my $log   = $old->app->log;
   if (my $sub = $new->can('handler')) {
@@ -168,15 +167,15 @@ sub _controller {
 
       if (my $sub = $new->can($method)) {
         $old->stash->{'mojo.routed'}++ unless $nested;
-        $continue = $sub->(local $_ = $new);
+        return 1 if $sub->(local $_ = $new);
       }
 
       else { $log->debug('Action not found in controller.') }
     }
     else { $log->debug(qq{Action "$method" is not allowed.}) }
   }
 
-  return !$nested || $continue;
+  return !$nested;
 }
 
 sub _load {