diff options
Diffstat (limited to 'java/lang/InheritableThreadLocal.java')
-rw-r--r-- | java/lang/InheritableThreadLocal.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/lang/InheritableThreadLocal.java b/java/lang/InheritableThreadLocal.java index bbcbc0c2f..2079a4c20 100644 --- a/java/lang/InheritableThreadLocal.java +++ b/java/lang/InheritableThreadLocal.java @@ -107,12 +107,12 @@ public class InheritableThreadLocal<T> extends ThreadLocal<T> { InheritableThreadLocal local = (InheritableThreadLocal)key; Object parentValue = parentThread.locals.get(key); - Object childValue = local.childValue(parentValue == NULL + Object childValue = local.childValue(parentValue == sentinel ? null : parentValue); if (childThread.locals == null) childThread.locals = new WeakIdentityHashMap(); childThread.locals.put(key, (childValue == null - ? NULL : childValue)); + ? sentinel : childValue)); } } } |