[Catalyst-commits] r8534 - Catalyst-Runtime/5.80/trunk/lib

[matthewt at dev.catalyst.perl.org]

Author: matthewt
Date: 2008-10-15 20:23:58 +0100 (Wed, 15 Oct 2008)
New Revision: 8534

Modified:
   Catalyst-Runtime/5.80/trunk/lib/Catalyst.pm
Log:
fixup merge from GO removal in 5.70 trunk

Modified: Catalyst-Runtime/5.80/trunk/lib/Catalyst.pm
===================================================================
--- Catalyst-Runtime/5.80/trunk/lib/Catalyst.pm	2008-10-15 19:23:04 UTC (rev 8533)
+++ Catalyst-Runtime/5.80/trunk/lib/Catalyst.pm	2008-10-15 19:23:58 UTC (rev 8534)
@@ -59,6 +59,7 @@
 our $START     = time;
 our $RECURSION = 1000;
 our $DETACH    = "catalyst_detach\n";
+our $GO        = "catalyst_go\n";
 
 #I imagine that very few of these really need to be class variables. if any.
 #maybe we should just make them attributes with a default?
@@ -1335,6 +1336,9 @@
         if ( !ref($error) and $error eq $DETACH ) {
             die $DETACH if($c->depth > 1);
         }
+        elsif ( !ref($error) and $error eq $GO ) {
+            die $GO if($c->depth > 0);
+        }
         else {
             unless ( ref $error ) {
                 no warnings 'uninitialized';