$GO and $DETACH should go back to Catalyst (t/aggregate/live_component_controller_act...

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 9dc38d7..5af713a 100644 (file)
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -52,6 +52,8 @@ $VERSION = eval $VERSION;
 
 our $COUNT     = 1;
 our $START     = time;
+our $DETACH    = Catalyst::Exception::Detach->new;
+our $GO        = Catalyst::Exception::Go->new;
 
 sub import {
     my ( $class, @arguments ) = @_;

diff --git a/lib/Catalyst/Context.pm b/lib/Catalyst/Context.pm
index df9a215..062eebd 100644 (file)
--- a/lib/Catalyst/Context.pm
+++ b/lib/Catalyst/Context.pm
@@ -89,8 +89,6 @@ sub finalize_output { shift->finalize_body(@_) };
 
 # For statistics
 our $RECURSION = 1000;
-our $DETACH    = Catalyst::Exception::Detach->new;
-our $GO        = Catalyst::Exception::Go->new;
 
 =head1 METHODS