Backed out memory leak workaround, bumped Text::ASCIITable dep to 0.17

[catagits/Catalyst-Runtime.git] / lib / Catalyst / Dispatcher.pm

diff --git a/lib/Catalyst/Dispatcher.pm b/lib/Catalyst/Dispatcher.pm
index 3c6404a..cb01934 100644 (file)
--- a/lib/Catalyst/Dispatcher.pm
+++ b/lib/Catalyst/Dispatcher.pm
@@ -33,6 +33,7 @@ Like C<forward> but doesn't return.
 sub detach {
     my ( $c, $command, @args ) = @_;
     $c->forward( $command, @args ) if $command;
+    # die with DETACH signal, which will be caught in dispatching.
     die $Catalyst::Engine::DETACH;
 }
 
@@ -92,9 +93,7 @@ sub dispatch {
             $c->execute( @{ $end->[0] } );
             return if scalar @{ $c->error };
         }
-    }
-
-    else {
+    } else {
         my $path  = $c->req->path;
         my $error = $path
           ? qq/Unknown resource "$path"/
@@ -152,7 +151,7 @@ sub forward {
 
     unless ( @{$results} ) {
 
-        unless ( $c->components->{$command} ) {
+        unless ( defined( $c->components->{$command} ) ) {
             my $error =
 qq/Couldn't forward to command "$command". Invalid action or component./;
             $c->error($error);
@@ -166,9 +165,7 @@ qq/Couldn't forward to command "$command". Invalid action or component./;
         if ( my $code = $c->components->{$class}->can($method) ) {
             $c->actions->{reverse}->{"$code"} = "$class->$method";
             $results = [ [ [ $class, $code ] ] ];
-        }
-
-        else {
+        } else {
             my $error =
               qq/Couldn't forward to "$class". Does not implement "$method"/;
             $c->error($error);
@@ -212,6 +209,7 @@ sub get_action {
             push @results, [$result] if $result;
             my $visitor = Tree::Simple::Visitor::FindByPath->new;
 
+            SEARCH:
             for my $part ( split '/', $namespace ) {
                 $visitor->setSearchPath($part);
                 $parent->accept($visitor);
@@ -219,7 +217,12 @@ sub get_action {
                 my $uid   = $child->getUID if $child;
                 my $match = $c->actions->{private}->{$uid}->{$action} if $uid;
                 push @results, [$match] if $match;
-                $parent = $child if $child;
+                if ($child) {
+                    $parent = $child;
+                }
+                else {
+                    last SEARCH;
+                }
             }
 
         }