aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillermo Iguaran <guilleiguaran@gmail.com>2013-08-18 19:47:33 -0500
committerGuillermo Iguaran <guilleiguaran@gmail.com>2013-08-18 19:47:33 -0500
commit726001485005629b155240fe85f8a011f15d6b84 (patch)
treeb47010caa85dd2848c5878483110244c2f5a4595
parent48c8135423dd7a8ff676b858cad6795a15903826 (diff)
downloadrails-726001485005629b155240fe85f8a011f15d6b84.tar.gz
rails-726001485005629b155240fe85f8a011f15d6b84.tar.bz2
rails-726001485005629b155240fe85f8a011f15d6b84.zip
oops, I missed this in 7193f75
-rw-r--r--activesupport/lib/active_support/core_ext/thread.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/core_ext/thread.rb b/activesupport/lib/active_support/core_ext/thread.rb
index de752f14ef..878ec73ef0 100644
--- a/activesupport/lib/active_support/core_ext/thread.rb
+++ b/activesupport/lib/active_support/core_ext/thread.rb
@@ -65,7 +65,7 @@ class Thread
private
def _locals
- if defined?(@locals)
+ if defined?(@_locals)
@_locals
else
LOCK.synchronize { @_locals ||= {} }