diff options
| author | Matthew Draper <matthew@trebex.net> | 2015-07-21 11:47:16 +0930 |
|---|---|---|
| committer | Matthew Draper <matthew@trebex.net> | 2015-07-21 12:03:38 +0930 |
| commit | 4c54b2a9a012296709de5283eada03470d581dc9 (patch) | |
| tree | d28ba312ded82a2c239c18280461db9abcd2cbe6 /activesupport/lib/active_support/concurrency | |
| parent | ef4d3342728ad29a8ecf0f4eebf39e4c91aaabee (diff) | |
| download | rails-4c54b2a9a012296709de5283eada03470d581dc9.tar.gz rails-4c54b2a9a012296709de5283eada03470d581dc9.tar.bz2 rails-4c54b2a9a012296709de5283eada03470d581dc9.zip | |
Adjust expectations around purpose/compatibility options
Diffstat (limited to 'activesupport/lib/active_support/concurrency')
| -rw-r--r-- | activesupport/lib/active_support/concurrency/share_lock.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/concurrency/share_lock.rb b/activesupport/lib/active_support/concurrency/share_lock.rb index 48edcfdaa5..39ae9bfb79 100644 --- a/activesupport/lib/active_support/concurrency/share_lock.rb +++ b/activesupport/lib/active_support/concurrency/share_lock.rb @@ -132,7 +132,7 @@ module ActiveSupport # Must be called within synchronize def busy?(purpose) (@exclusive_thread && @exclusive_thread != Thread.current) || - (purpose && @waiting.any? { |k, v| k != Thread.current && !v.include?(purpose) }) || + @waiting.any? { |k, v| k != Thread.current && !v.include?(purpose) } || @sharing.size > (@sharing[Thread.current] > 0 ? 1 : 0) end end |