From 356086944ddf0a34def10c99d9fe5670e78e9065 Mon Sep 17 00:00:00 2001
From: Emilio Tagua <miloops@gmail.com>
Date: Fri, 18 Feb 2011 15:40:06 -0300
Subject: Reindent and remove wrong line left in merge by mistake.
---
activerecord/lib/active_record/associations/association.rb | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
(limited to 'activerecord')
diff --git a/activerecord/lib/active_record/associations/association.rb b/activerecord/lib/active_record/associations/association.rb
index ae745ea7c2..32eb9ee542 100644
--- a/activerecord/lib/active_record/associations/association.rb
+++ b/activerecord/lib/active_record/associations/association.rb
@@ -144,16 +144,15 @@ module ActiveRecord
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
--
cgit v1.2.3