merging gsoc_breadboard changes

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 2b28907..b8e62cf 100644 (file)
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -561,6 +561,7 @@ sub controller {
     unshift @args, $c;
 
     if( $name ) {
+        # Direct component hash lookup to avoid costly regexps
         return $container->get_component($name, \@args)
             if $container->has_service($name) && !ref $name;
 
@@ -600,7 +601,7 @@ sub model {
     if( $name ) {
         # Direct component hash lookup to avoid costly regexps
         return $container->get_component($name, \@args)
-            if ( !ref $name && $container->has_service($name));
+            if $container->has_service($name) && !ref $name;
 
         return $container->get_component_regexp( $c, $name, \@args );
     }