fixed automatic rendering to work after non-blocking operations have …

…been performed in bridges
mojolicious · Aug 31, 2013 · d04f636 · d04f636
1 parent 8c26f2c
commit d04f636
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/Changes b/Changes
@@ -1,5 +1,7 @@
 
-4.29  2013-08-30
+4.29  2013-08-31
+  - Fixed automatic rendering to work after non-blocking operations have been
+    performed in bridges.
 
 4.28  2013-08-29
   - Added support for non-blocking operations in bridges to

diff --git a/lib/Mojolicious/Controller.pm b/lib/Mojolicious/Controller.pm
@@ -520,7 +520,7 @@ implements the following new ones.
 
 =head2 continue
 
-  my $success = $c->continue;
+  $c->continue;
 
 Continue dispatch chain.
 

diff --git a/lib/Mojolicious/Routes.pm b/lib/Mojolicious/Routes.pm
@@ -30,20 +30,19 @@ sub continue {
   my $match   = $c->match;
   my $stack   = $match->stack;
   my $current = $match->current;
-  return 1 unless my $field = $stack->[$current];
-  my $last = !$stack->[++$current];
+  return $self->auto_render($c) unless my $field = $stack->[$current];
 
   # Merge captures into stash
   my @keys  = keys %$field;
   my $stash = $c->stash;
   @{$stash}{@keys} = @{$stash->{'mojo.captures'}}{@keys} = values %$field;
 
   my $continue;
+  my $last = !$stack->[++$current];
   if (my $cb = $field->{cb}) { $continue = $self->_callback($c, $cb, $last) }
   else { $continue = $self->_controller($c, $field, $last) }
   $match->current($current);
-
-  return $last || $continue ? $self->continue($c) : undef;
+  $self->continue($c) if $last || $continue;
 }
 
 sub dispatch {
@@ -82,7 +81,7 @@ sub dispatch {
   }
 
   return undef unless @{$c->match->stack};
-  $self->auto_render($c) if $self->continue($c);
+  $self->continue($c);
   return 1;
 }
 

diff --git a/t/mojolicious/group_lite_app.t b/t/mojolicious/group_lite_app.t
@@ -36,7 +36,7 @@ under '/suspended' => sub {
   return 0;
 };
 
-get '/' => sub { shift->render(inline => '<%= $suspended %>\\') };
+get '/' => {inline => '<%= $suspended %>\\'};
 
 under sub {
   my $self = shift;