diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2011-05-13 23:38:32 +0100 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2011-05-13 23:53:02 +0100 |
| commit | 5d4799d5933d43ce753e313c6d6d0d47343acfdc (patch) | |
| tree | 0769796918118ca7dd5d717de8ca97ac343747fa /activerecord/lib | |
| parent | 0307fc70add3337a9371ab40d7635372511a8f17 (diff) | |
| download | rails-5d4799d5933d43ce753e313c6d6d0d47343acfdc.tar.gz rails-5d4799d5933d43ce753e313c6d6d0d47343acfdc.tar.bz2 rails-5d4799d5933d43ce753e313c6d6d0d47343acfdc.zip | |
Remove pointless rescue (it doesn't happen anywhere in the tests, and I can't see a way that it would happen ever)
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/associations/collection_association.rb | 10 |
1 files changed, 1 insertions, 9 deletions
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! |