From: André Walker <andre@andrewalker.net>
Date: Wed, 6 Jul 2011 15:24:15 +0000 (-0300)
Subject: merging gsoc_breadboard changes
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=63d30ea9142646891393d9d4e9c25f7672d4f653;hp=1f90ca597beb428f6b9d9be207b097701fe36e59;p=catagits%2FCatalyst-Runtime.git

merging gsoc_breadboard changes
---

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 2b28907..b8e62cf 100644
--- 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 );
     }