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 /activesupport/lib/active_support/values/time_zone.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 'activesupport/lib/active_support/values/time_zone.rb')
| -rw-r--r-- | activesupport/lib/active_support/values/time_zone.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/values/time_zone.rb b/activesupport/lib/active_support/values/time_zone.rb index c8dbe92171..4502e01b12 100644 --- a/activesupport/lib/active_support/values/time_zone.rb +++ b/activesupport/lib/active_support/values/time_zone.rb @@ -1,5 +1,5 @@ require 'tzinfo' -require 'thread_safe' +require 'concurrent' require 'active_support/core_ext/object/blank' require 'active_support/core_ext/object/try' @@ -189,7 +189,7 @@ module ActiveSupport UTC_OFFSET_WITH_COLON = '%s%02d:%02d' UTC_OFFSET_WITHOUT_COLON = UTC_OFFSET_WITH_COLON.tr(':', '') - @lazy_zones_map = ThreadSafe::Cache.new + @lazy_zones_map = Concurrent::Map.new class << self # Assumes self represents an offset from UTC in seconds (as returned from |