aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-02-17 19:20:44 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-02-17 19:20:44 +0000
commitea3faf3df9c13b8e4b0a6553da676099e92abc4f (patch)
treeb9129e87de54185f91cc1562153e8c4bd55f81ad /actionpack
parent0e764a55991179dd371df8c0c5b5d5bd7fd2b793 (diff)
downloadrails-ea3faf3df9c13b8e4b0a6553da676099e92abc4f.tar.gz
rails-ea3faf3df9c13b8e4b0a6553da676099e92abc4f.tar.bz2
rails-ea3faf3df9c13b8e4b0a6553da676099e92abc4f.zip
Only load ROUTE_FILE if one has been declared
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@651 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_controller/routing.rb4
1 files changed, 1 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/routing.rb b/actionpack/lib/action_controller/routing.rb
index 2633eff09c..84dd29e8eb 100644
--- a/actionpack/lib/action_controller/routing.rb
+++ b/actionpack/lib/action_controller/routing.rb
@@ -238,9 +238,7 @@ module ActionController
def reload
begin
- require_dependency(ROUTE_FILE)
- rescue NoMethodError
- # ignore for unit tests
+ require_dependency(ROUTE_FILE) if ROUTE_FILE
rescue LoadError, ScriptError => e
raise RoutingError, "Cannot load config/routes.rb:\n #{e.message}"
ensure # Ensure that there is at least one route: