1 files changed, 18 insertions, 13 deletions
diff --git a/activesupport/lib/active_support/core_ext/thread.rb b/activesupport/lib/active_support/core_ext/thread.rb
index 5481766f10..ac1ffa4128 100644
--- a/activesupport/lib/active_support/core_ext/thread.rb
+++ b/activesupport/lib/active_support/core_ext/thread.rb
@@ -23,29 +23,29 @@ class Thread
   # for the fiber local. The fiber is executed in the same thread, so the
   # thread local values are available.
   def thread_variable_get(key)
-    locals[key.to_sym]
+    _locals[key.to_sym]
   end
 
   # Sets a thread local with +key+ to +value+. Note that these are local to
   # threads, and not to fibers. Please see Thread#thread_variable_get for
   # more information.
   def thread_variable_set(key, value)
-    locals[key.to_sym] = value
+    _locals[key.to_sym] = value
   end
 
-  # Returns an an array of the names of the thread-local variables (as Symbols).
+  # Returns an array of the names of the thread-local variables (as Symbols).
   #
   #    thr = Thread.new do
   #      Thread.current.thread_variable_set(:cat, 'meow')
   #      Thread.current.thread_variable_set("dog", 'woof')
   #    end
-  #    thr.join               #=> #<Thread:0x401b3f10 dead>
-  #    thr.thread_variables   #=> [:dog, :cat]
+  #    thr.join               # => #<Thread:0x401b3f10 dead>
+  #    thr.thread_variables   # => [:dog, :cat]
   #
   # Note that these are not fiber local variables. Please see Thread#thread_variable_get
   # for more details.
   def thread_variables
-    locals.keys
+    _locals.keys
   end
 
   # Returns <tt>true</tt> if the given string (or symbol) exists as a
@@ -53,22 +53,27 @@ class Thread
   #
   #    me = Thread.current
   #    me.thread_variable_set(:oliver, "a")
-  #    me.thread_variable?(:oliver)    #=> true
-  #    me.thread_variable?(:stanley)   #=> false
+  #    me.thread_variable?(:oliver)    # => true
+  #    me.thread_variable?(:stanley)   # => false
   #
   # Note that these are not fiber local variables. Please see Thread#thread_variable_get
   # for more details.
   def thread_variable?(key)
-    locals.has_key?(key.to_sym)
+    _locals.has_key?(key.to_sym)
+  end
+
+  def freeze
+    _locals.freeze
+    super
   end
 
   private
 
-  def locals
-    if defined?(@locals)
-      @locals
+  def _locals
+    if defined?(@_locals)
+      @_locals
     else
-      LOCK.synchronize { @locals ||= {} }
+      LOCK.synchronize { @_locals ||= {} }
     end
   end
 end unless Thread.instance_methods.include?(:thread_variable_set)