lib/identity_cache/cached/recursive/association.rb in identity_cache-1.5.5 vs lib/identity_cache/cached/recursive/association.rb in identity_cache-1.5.6
- old
+ new
@@ -23,10 +23,10 @@
end
def read(record)
assoc = record.association(name)
- if (record.send(:loaded_by_idc?) || assoc.klass.should_use_cache?) && !assoc.loaded? && assoc.target.blank?
+ if !assoc.loaded? && assoc.target.blank? && (record.send(:loaded_by_idc?) || assoc.klass.should_use_cache?)
if record.instance_variable_defined?(records_variable_name)
record.instance_variable_get(records_variable_name)
elsif record.instance_variable_defined?(dehydrated_variable_name)
dehydrated_target = record.instance_variable_get(dehydrated_variable_name)
association_target = hydrate_association_target(assoc.klass, dehydrated_target)