only do one nil check against the controller

1 files changed, 9 insertions, 9 deletions

diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index aaf5563dce..5027425d6b 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -250,8 +250,14 @@ module ActionDispatch
             if controller.is_a? Regexp
               hash[:controller] = controller
             else
-              check_controller! controller
-              hash[:controller] = controller.to_s if controller
+              if controller
+                hash[:controller] = check_controller!(controller).to_s
+              else
+                unless segment_keys.include?(:controller)
+                  message = "Missing :controller key on routes definition, please check your routes."
+                  raise ArgumentError, message
+                end
+              end
             end
 
             if action.is_a? Regexp
@@ -292,13 +298,7 @@ module ActionDispatch
           end
 
           def check_controller!(controller)
-            unless controller || segment_keys.include?(:controller)
-              message = "Missing :controller key on routes definition, please check your routes."
-              raise ArgumentError, message
-            end
-
-            return unless controller
-            return if controller =~ /\A[a-z_0-9][a-z_0-9\/]*\z/
+            return controller if controller =~ /\A[a-z_0-9][a-z_0-9\/]*\z/
 
             if controller =~ %r{\A/}
               message = "controller name should not start with a slash"