From: Matt S Trout Date: Wed, 15 Oct 2008 19:23:58 +0000 (+0000) Subject: fixup merge from GO removal in 5.70 trunk X-Git-Tag: 5.8000_03~38 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=55424863eb3c285a31f47e0acedab864ccb1f335 fixup merge from GO removal in 5.70 trunk --- diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm index 4fd4da2..45036a6 100644 --- a/lib/Catalyst.pm +++ b/lib/Catalyst.pm @@ -59,6 +59,7 @@ our $COUNT = 1; 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 @@ sub execute { 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';