X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst.pm;fp=lib%2FCatalyst.pm;h=ad387c0c9c7325bd035e0163273dba8585901841;hb=b79f858d1c7bc042ba8dc8b33e66a71902266754;hp=134f5b63e85d635dc3c3233ed072dc768a1ad69c;hpb=8dc2fca3dc997b04ce6d866a3c132b119807b83d;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 134f5b6..ad387c0 100644
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -1462,7 +1462,6 @@ around components => sub {
 
         my ($type, $name) = _get_component_type_name($component);
 
-# FIXME: shouldn't the service name be $name?
         $containers->{$type}->add_service(Catalyst::IOC::BlockInjection->new( name => $name, block => sub { return $class->setup_component($component) } ));
     }
 
@@ -2382,6 +2381,9 @@ sub setup_components {
             $class->components->{ $component } = $class->setup_component($component);
         }
     }
+
+    $containers->{model}->make_single_default;
+    $containers->{view}->make_single_default;
 }
 
 sub _get_component_type_name {