From b55fc9e85aa79ca4c9ad1aef74b5d1a87aab87bb Mon Sep 17 00:00:00 2001 From: Nicholas Seckar Date: Tue, 28 Mar 2006 01:48:59 +0000 Subject: Replace 'rescue Object' with a finer grained rescue. Closes #4431 git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4076 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- activerecord/lib/active_record/base.rb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'activerecord/lib') diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index 62ea47226e..5b02d17f59 100755 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -1232,9 +1232,12 @@ module ActiveRecord #:nodoc: # Returns the class type of the record using the current module as a prefix. So descendents of # MyApp::Business::Account would appear as MyApp::Business::AccountSubclass. def compute_type(type_name) + modularized_name = type_name_with_module(type_name) begin - instance_eval(type_name_with_module(type_name)) - rescue Object + instance_eval(modularized_name) + rescue NameError => e + first_module = modularized_name.split("::").first + raise unless e.to_s.include? first_module instance_eval(type_name) end end -- cgit v1.2.3