loaded? will not raise an AR::RecordNotFound exception, so move the r…

…escue inside the conditional
rails · Jan 14, 2011 · a0a69b0 · a0a69b0
1 parent c326969
commit a0a69b0
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/activerecord/lib/active_record/associations/association_collection.rb b/activerecord/lib/active_record/associations/association_collection.rb
@@ -350,8 +350,8 @@ def uniq_select_value
 
         def load_target
           if !@owner.new_record? || foreign_key_present?
-            begin
-              unless loaded?
+            unless loaded?
+              begin
                 if @target.is_a?(Array) && @target.any?
                   @target = find_target.map do |f|
                     i = @target.index(f)
@@ -371,9 +371,9 @@ def load_target
                 else
                   @target = find_target
                 end
+              rescue ActiveRecord::RecordNotFound
+                reset
               end
-            rescue ActiveRecord::RecordNotFound
-              reset
             end
           end