[Catalyst-commits] r9728 - in Catalyst-Runtime/5.80/trunk/lib: . Catalyst

[marcus at dev.catalyst.perl.org]

Author: marcus
Date: 2009-04-18 15:41:50 +0100 (Sat, 18 Apr 2009)
New Revision: 9728

Modified:
   Catalyst-Runtime/5.80/trunk/lib/Catalyst.pm
   Catalyst-Runtime/5.80/trunk/lib/Catalyst/Dispatcher.pm
Log:
Shut up recursion warnings


Modified: Catalyst-Runtime/5.80/trunk/lib/Catalyst/Dispatcher.pm
===================================================================
--- Catalyst-Runtime/5.80/trunk/lib/Catalyst/Dispatcher.pm	2009-04-18 14:41:45 UTC (rev 9727)
+++ Catalyst-Runtime/5.80/trunk/lib/Catalyst/Dispatcher.pm	2009-04-18 14:41:50 UTC (rev 9728)
@@ -15,6 +15,7 @@
 use Tree::Simple;
 use Tree::Simple::Visitor::FindByPath;
 
+
 # Refactoring note:
 # do these belong as package vars or should we build these via a builder method?
 # See Catalyst-Plugin-Server for them being added to, which should be much less ugly.
@@ -236,6 +237,7 @@
 
 sub forward {
     my $self = shift;
+    no warnings 'recursion';
     $self->_do_forward(forward => @_);
 }
 
@@ -253,9 +255,9 @@
         return 0;
     }
 
-    no warnings 'recursion';
 
     local $c->request->{arguments} = $args;
+    no warnings 'recursion';
     $action->dispatch( $c );
 
     return $c->state;

Modified: Catalyst-Runtime/5.80/trunk/lib/Catalyst.pm
===================================================================
--- Catalyst-Runtime/5.80/trunk/lib/Catalyst.pm	2009-04-18 14:41:45 UTC (rev 9727)
+++ Catalyst-Runtime/5.80/trunk/lib/Catalyst.pm	2009-04-18 14:41:50 UTC (rev 9728)
@@ -1480,6 +1480,7 @@
 
     push( @{ $c->stack }, $code );
     
+    no warnings 'recursion';
     eval { $c->state( $code->execute( $class, $c, @{ $c->req->args } ) || 0 ) };
 
     $c->_stats_finish_execute( $stats_info ) if $c->use_stats and $stats_info;