Imported GNU Classpath 0.20

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

View file

@ -475,7 +475,7 @@ public class WeakHashMap extends AbstractMap implements Map
if (o instanceof Map.Entry)
{
Map.Entry e = (Map.Entry) o;
return key.equals(e.getKey())
return WeakHashMap.equals(getKey(), e.getKey())
&& WeakHashMap.equals(value, e.getValue());
}
return false;
@ -483,7 +483,7 @@ public class WeakHashMap extends AbstractMap implements Map
public String toString()
{
return key + "=" + value;
return getKey() + "=" + value;
}
}
@ -657,7 +657,7 @@ public class WeakHashMap extends AbstractMap implements Map
while (bucket != null)
{
WeakBucket.WeakEntry entry = bucket.getEntry();
if (entry != null && key.equals(entry.key))
if (entry != null && equals(key, entry.key))
return entry;
bucket = bucket.next;