aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2015-08-09 23:27:40 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2015-08-09 23:27:40 -0300
commit09e1689252eed120ca1646926fd2324fb5097917 (patch)
tree1f330dc77c66e79fa6898f114fc7c6a276524151 /actionpack/lib
parent20cf2dd0892d3d1b374d63d39d936ad60a0fb36e (diff)
downloadrails-09e1689252eed120ca1646926fd2324fb5097917.tar.gz
rails-09e1689252eed120ca1646926fd2324fb5097917.tar.bz2
rails-09e1689252eed120ca1646926fd2324fb5097917.zip
Remove the conditional since it is done in the method
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_dispatch/routing/route_set.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb
index 8138c4ee57..b3e9489141 100644
--- a/actionpack/lib/action_dispatch/routing/route_set.rb
+++ b/actionpack/lib/action_dispatch/routing/route_set.rb
@@ -816,12 +816,12 @@ module ActionDispatch
if app.matches?(req) && app.dispatcher?
dispatcher = app.app
- if dispatcher.controller(params, false)
- dispatcher.prepare_params!(params)
- return params
- else
+ dispatcher.controller(params, false) do
raise ActionController::RoutingError, "A route matches #{path.inspect}, but references missing controller: #{params[:controller].camelize}Controller"
end
+
+ dispatcher.prepare_params!(params)
+ return params
end
end