added the app to the container when the app is built

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index fad4c90..1b4c69f 100644 (file)
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -142,6 +142,15 @@ sub MODIFY_CODE_ATTRIBUTES {
     );
 }
 
+sub BUILD {
+    my $self = shift;
+    my $class = ref $self;
+
+    Catalyst::Exception->throw("You can't run the application before $class" . "->setup")
+        unless $class->setup_finished;
+
+    $self->container->_set_application($self);
+}
 
 sub _application { $_[0] }
 

diff --git a/lib/Catalyst/IOC/Container.pm b/lib/Catalyst/IOC/Container.pm
index e5609b3..d152144 100644 (file)
--- a/lib/Catalyst/IOC/Container.pm
+++ b/lib/Catalyst/IOC/Container.pm
@@ -45,6 +45,8 @@ has application => (
     is       => 'ro',
     isa      => 'Catalyst|Str',
     lazy     => 1,
+    weak_ref => 1,
+    writer   => '_set_application',
     default  => sub { shift->application_name },
 );