Permalink
Browse files

Reindent and remove wrong line left in merge by mistake.

  • Loading branch information...
1 parent b8c2feb commit 356086944ddf0a34def10c99d9fe5670e78e9065 @miloops miloops committed Feb 18, 2011
Showing with 3 additions and 4 deletions.
  1. +3 −4 activerecord/lib/active_record/associations/association.rb
@@ -144,16 +144,15 @@ def target_scope
def load_target
if find_target?
begin
- if IdentityMap.enabled? && association_class && association_class.respond_to?(:base_class)
- @target = IdentityMap.get(association_class, @owner[@reflection.foreign_key])
- end
+ if IdentityMap.enabled? && association_class && association_class.respond_to?(:base_class)
+ @target = IdentityMap.get(association_class, @owner[@reflection.foreign_key])
+ end
rescue NameError
nil
ensure
@target ||= find_target
end
end
- @target = find_target if find_target?
loaded!
target
rescue ActiveRecord::RecordNotFound

0 comments on commit 3560869

Please sign in to comment.