diff options
author | Vijay Dev <vijaydev.cse@gmail.com> | 2015-10-31 17:01:41 +0000 |
---|---|---|
committer | Vijay Dev <vijaydev.cse@gmail.com> | 2015-10-31 17:01:41 +0000 |
commit | b217354dbbbbb49a020b0073ebb62c5cd2d96140 (patch) | |
tree | b4bbbf8cf1e5223f21e81856a62b9b53c88713a6 /activesupport/lib/active_support/dependencies.rb | |
parent | e913834e92845b09c2e5be6394b63702c538764b (diff) | |
parent | e9a8b15778adeeda8dfccd2af6ca86b7e6bda575 (diff) | |
download | rails-b217354dbbbbb49a020b0073ebb62c5cd2d96140.tar.gz rails-b217354dbbbbb49a020b0073ebb62c5cd2d96140.tar.bz2 rails-b217354dbbbbb49a020b0073ebb62c5cd2d96140.zip |
Merge branch 'master' of github.com:rails/docrails
Diffstat (limited to 'activesupport/lib/active_support/dependencies.rb')
-rw-r--r-- | activesupport/lib/active_support/dependencies.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/activesupport/lib/active_support/dependencies.rb b/activesupport/lib/active_support/dependencies.rb index 16b726bcba..dc9f97168a 100644 --- a/activesupport/lib/active_support/dependencies.rb +++ b/activesupport/lib/active_support/dependencies.rb @@ -25,21 +25,21 @@ module ActiveSupport #:nodoc: # :doc: # Execute the supplied block without interference from any - # concurrent loads + # concurrent loads. def self.run_interlock Dependencies.interlock.running { yield } end # Execute the supplied block while holding an exclusive lock, # preventing any other thread from being inside a #run_interlock - # block at the same time + # block at the same time. def self.load_interlock Dependencies.interlock.loading { yield } end # Execute the supplied block while holding an exclusive lock, # preventing any other thread from being inside a #run_interlock - # block at the same time + # block at the same time. def self.unload_interlock Dependencies.interlock.unloading { yield } end |