made routes without conditions slightly faster

mojolicious · Mar 20, 2012 · 84371e5 · judofyr · Mar 20, 2012 · kraih
1 parent c80c51a
commit 84371e5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/Changes b/Changes
@@ -11,7 +11,6 @@ This file documents the revision history for Perl extension Mojolicious.
         - Improved tests.
         - Fixed bug that slowed down Mojolicious::Renderer.
         - Fixed small newline capture bug in Mojolicious::Routes::Match.
-        - Fixed small condition bug.
 
 2.62    2012-03-17 00:00:00
         - Deprecated Mojolicious::Renderer->default_template_class in favor

diff --git a/lib/Mojolicious/Routes/Match.pm b/lib/Mojolicious/Routes/Match.pm
@@ -44,11 +44,12 @@ sub match {
   }
 
   # Conditions
-  my $over = $r->over || [];
-  my $conditions = $self->{conditions} ||= $r->root->conditions;
-  for (my $i = 0; $i < @$over; $i += 2) {
-    return unless my $condition = $conditions->{$over->[$i]};
-    return if !$condition->($r, $c, $captures, $over->[$i + 1]);
+  if (my $over = $r->over) {
+    my $conditions = $self->{conditions} ||= $r->root->conditions;
+    for (my $i = 0; $i < @$over; $i += 2) {
+      return unless my $condition = $conditions->{$over->[$i]};
+      return if !$condition->($r, $c, $captures, $over->[$i + 1]);
+    }
   }
 
   # WebSocket