From 5d4799d5933d43ce753e313c6d6d0d47343acfdc Mon Sep 17 00:00:00 2001 From: Jon Leighton Date: Fri, 13 May 2011 23:38:32 +0100 Subject: Remove pointless rescue (it doesn't happen anywhere in the tests, and I can't see a way that it would happen ever) --- .../lib/active_record/associations/collection_association.rb | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'activerecord') diff --git a/activerecord/lib/active_record/associations/collection_association.rb b/activerecord/lib/active_record/associations/collection_association.rb index deb2b9af32..858317550d 100644 --- a/activerecord/lib/active_record/associations/collection_association.rb +++ b/activerecord/lib/active_record/associations/collection_association.rb @@ -336,15 +336,7 @@ module ActiveRecord def load_target if find_target? - targets = [] - - begin - targets = find_target - rescue ActiveRecord::RecordNotFound - reset - end - - @target = merge_target_lists(targets, target) + @target = merge_target_lists(find_target, target) end loaded! -- cgit v1.2.3