TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Reindent and remove wrong line left in merge by mistake.

Browse Source
This commit is contained in:
Emilio Tagua 2011-02-18 15:40:06 -03:00
parent b8c2feb97e
commit 356086944d
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
activerecord/lib/active_record/associations/association.rb
View File

@ -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