aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch/routing
diff options
context:
space:
mode:
authorMilan Dobrota <mdobrota@tribune.com>2011-09-04 10:44:08 -0500
committerMilan Dobrota <mdobrota@tribune.com>2011-09-04 10:44:08 -0500
commit9b08afd2f4d501fb1710ba0ed4e19313093605c8 (patch)
tree93c181f5831e772f6ab044516fb36be43dbd3aa3 /actionpack/lib/action_dispatch/routing
parentabb09054043c556ae38d2c9d1e9037eceb6dc426 (diff)
downloadrails-9b08afd2f4d501fb1710ba0ed4e19313093605c8.tar.gz
rails-9b08afd2f4d501fb1710ba0ed4e19313093605c8.tar.bz2
rails-9b08afd2f4d501fb1710ba0ed4e19313093605c8.zip
if ... nil? is more expensive than unless
Diffstat (limited to 'actionpack/lib/action_dispatch/routing')
-rw-r--r--actionpack/lib/action_dispatch/routing/mapper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index 0c43954d81..21dc5af486 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -1436,7 +1436,7 @@ module ActionDispatch
name_prefix = @scope[:as]
if parent_resource
- return nil if as.nil? && action.nil?
+ return nil unless as || action
collection_name = parent_resource.collection_name
member_name = parent_resource.member_name