procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Imported GNU Classpath 0.20

Browse source 
Imported GNU Classpath 0.20
       * Makefile.am (AM_CPPFLAGS): Add classpath/include.
       * java/nio/charset/spi/CharsetProvider.java: New override file.
       * java/security/Security.java: Likewise.
       * sources.am: Regenerated.
       * Makefile.in: Likewise.

From-SVN: r109831
This commit is contained in:
Mark Wielaard 2006-01-17 18:09:40 +00:00
parent bcb36c3e02
commit 2127637945
444 changed files with 75778 additions and 30731 deletions
Download patch file Download diff file Expand all files Collapse all files

23
libjava/classpath/java/lang/ThreadLocal.java
View file

@ -1,5 +1,5 @@
/* ThreadLocal -- a variable with a unique value per thread
Copyright (C) 2000, 2002, 2003 Free Software Foundation, Inc.
Copyright (C) 2000, 2002, 2003, 2006 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@ -95,21 +95,6 @@ public class ThreadLocal
*/
static final Object NULL = new Object();
/**
* Serves as a key for the Thread.locals WeakHashMap.
* We can't use "this", because a subclass may override equals/hashCode
* and we need to use object identity for the map.
*/
final Key key = new Key();
class Key
{
ThreadLocal get()
{
return ThreadLocal.this;
}
}
/**
* Creates a ThreadLocal object without associating any value to it yet.
*/
@ -143,11 +128,11 @@ public class ThreadLocal
Map map = Thread.getThreadLocals();
// Note that we don't have to synchronize, as only this thread will
// ever modify the map.
Object value = map.get(key);
Object value = map.get(this);
if (value == null)
{
value = initialValue();
map.put(key, value == null ? NULL : value);
map.put(this, value == null ? NULL : value);
}
return value == NULL ? null : value;
}
@ -165,6 +150,6 @@ public class ThreadLocal
Map map = Thread.getThreadLocals();
// Note that we don't have to synchronize, as only this thread will
// ever modify the map.
map.put(key, value == null ? NULL : value);
map.put(this, value == null ? NULL : value);
}
}