Permalink
Browse files

Remove pointless rescue (it doesn't happen anywhere in the tests, and…

… I can't see a way that it would happen ever)
  • Loading branch information...
1 parent 0307fc7 commit 5d4799d5933d43ce753e313c6d6d0d47343acfdc @jonleighton jonleighton committed May 13, 2011
Showing with 1 addition and 9 deletions.
  1. +1 −9 activerecord/lib/active_record/associations/collection_association.rb
@@ -336,15 +336,7 @@ def include?(record)
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!

0 comments on commit 5d4799d

Please sign in to comment.