diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-02-20 17:45:10 -0200 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-02-20 17:45:10 -0200 |
commit | 37bef5827f94137f4542cacc669e9c3ce6c9495d (patch) | |
tree | 3c0b9379da5e2f68a459e52ac0910e51ee0bf85c /activerecord/lib/active_record/persistence.rb | |
parent | 192d319fdbb5b1575b5541bb5395c87d87fadfa1 (diff) | |
parent | 9d569585a20ddd9ddb3602921f2ccffc208998d8 (diff) | |
download | rails-37bef5827f94137f4542cacc669e9c3ce6c9495d.tar.gz rails-37bef5827f94137f4542cacc669e9c3ce6c9495d.tar.bz2 rails-37bef5827f94137f4542cacc669e9c3ce6c9495d.zip |
Merge pull request #16989 from Empact/reload-cache-clear
Isolate access to @associations_cache and @aggregations_cache to the Associations and Aggregations modules, respectively.
Diffstat (limited to 'activerecord/lib/active_record/persistence.rb')
-rw-r--r-- | activerecord/lib/active_record/persistence.rb | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/persistence.rb b/activerecord/lib/active_record/persistence.rb index 35d1085f5a..7c076864a3 100644 --- a/activerecord/lib/active_record/persistence.rb +++ b/activerecord/lib/active_record/persistence.rb @@ -415,9 +415,6 @@ module ActiveRecord # end # def reload(options = nil) - clear_aggregation_cache - clear_association_cache - fresh_object = if options && options[:lock] self.class.unscoped { self.class.lock(options[:lock]).find(id) } |