diff options
| author | Tom Tromey <tromey@gcc.gnu.org> | 2003-08-26 23:14:07 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2003-08-26 23:14:07 +0000 |
| commit | 777bb1d4382ddc4aa8c5db3885e276874a470de8 (patch) | |
| tree | e8da29583e38e3aa8a01bbb42b15fdc7e764bc52 /libjava/java/lang/InheritableThreadLocal.java | |
| parent | 228e7b6256a6d161aa9d45a0319cf7128ae7ad87 (diff) | |
| download | gcc-777bb1d4382ddc4aa8c5db3885e276874a470de8.zip gcc-777bb1d4382ddc4aa8c5db3885e276874a470de8.tar.gz gcc-777bb1d4382ddc4aa8c5db3885e276874a470de8.tar.bz2 | |
StrictMath.java: Typo fix.
* java/lang/StrictMath.java: Typo fix.
* java/lang/Math.java: Typo fix.
2003-08-26 Stephen Crawley <crawley@dstc.edu.au>
* java/lang/ThreadGroup.java (removeThread): null the 'group' field
of the removed Thread.
2003-08-26 Mark Wielaard <mark@klomp.org>
Reported by David Holmes <dholmes@dltech.com.au>.
* java/lang/InheritableThreadLocal.java (threadMap): Wrap inside
Collections.synchronizedMap.
* java/lang/ThreadLocal.java (valueMap): Likewise.
From-SVN: r70828
Diffstat (limited to 'libjava/java/lang/InheritableThreadLocal.java')
| -rw-r--r-- | libjava/java/lang/InheritableThreadLocal.java | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/libjava/java/lang/InheritableThreadLocal.java b/libjava/java/lang/InheritableThreadLocal.java index 31b64f5..5dfbe9a 100644 --- a/libjava/java/lang/InheritableThreadLocal.java +++ b/libjava/java/lang/InheritableThreadLocal.java @@ -1,5 +1,5 @@ /* InheritableThreadLocal -- a ThreadLocal which inherits values across threads - Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc. + Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -37,9 +37,11 @@ exception statement from your version. */ package java.lang; +import java.util.ArrayList; +import java.util.Collections; import java.util.Iterator; import java.util.List; -import java.util.ArrayList; +import java.util.Map; import java.util.WeakHashMap; /** @@ -67,7 +69,8 @@ public class InheritableThreadLocal extends ThreadLocal * List can be collected, too. Maps to a list in case the user overrides * equals. */ - private static final WeakHashMap threadMap = new WeakHashMap(); + private static final Map threadMap + = Collections.synchronizedMap(new WeakHashMap()); /** * Creates a new InheritableThreadLocal that has no values associated @@ -77,7 +80,7 @@ public class InheritableThreadLocal extends ThreadLocal { Thread currentThread = Thread.currentThread(); // Note that we don't have to synchronize, as only this thread will - // ever modify the returned heritage. + // ever modify the returned heritage and threadMap is a synchronizedMap. List heritage = (List) threadMap.get(currentThread); if (heritage == null) { @@ -114,7 +117,7 @@ public class InheritableThreadLocal extends ThreadLocal // The currentThread is the parent of the new thread. Thread parentThread = Thread.currentThread(); // Note that we don't have to synchronize, as only this thread will - // ever modify the returned heritage. + // ever modify the returned heritage and threadMap is a synchronizedMap. ArrayList heritage = (ArrayList) threadMap.get(parentThread); if (heritage != null) { |