diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2015-09-19 18:00:06 +0200 |
|---|---|---|
| committer | Kasper Timm Hansen <kaspth@gmail.com> | 2015-09-19 18:00:06 +0200 |
| commit | 1bf3cecf59821368cf3952188677b80a4407d883 (patch) | |
| tree | 50663e739dce52d51297193c99714047201e8e69 /actionview/lib/action_view/lookup_context.rb | |
| parent | dcc941382b44eec0704c120cf1a73067c37ab79b (diff) | |
| parent | 56ac6e4768adb1f7055474d40a9e921380559c43 (diff) | |
| download | rails-1bf3cecf59821368cf3952188677b80a4407d883.tar.gz rails-1bf3cecf59821368cf3952188677b80a4407d883.tar.bz2 rails-1bf3cecf59821368cf3952188677b80a4407d883.zip | |
Merge pull request #21679 from jdantonio/replace-thread-safe
Replaced `ThreadSafe::Map` with successor `Concurrent::Map`.
Diffstat (limited to 'actionview/lib/action_view/lookup_context.rb')
| -rw-r--r-- | actionview/lib/action_view/lookup_context.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionview/lib/action_view/lookup_context.rb b/actionview/lib/action_view/lookup_context.rb index fba9a44cb1..8b7ede250a 100644 --- a/actionview/lib/action_view/lookup_context.rb +++ b/actionview/lib/action_view/lookup_context.rb @@ -1,4 +1,4 @@ -require 'thread_safe' +require 'concurrent' require 'active_support/core_ext/module/remove_method' require 'active_support/core_ext/module/attribute_accessors' require 'action_view/template/resolver' @@ -62,7 +62,7 @@ module ActionView alias :object_hash :hash attr_reader :hash - @details_keys = ThreadSafe::Cache.new + @details_keys = Concurrent::Map.new def self.get(details) if details[:formats] |