From c3a5f1656b89e35bea2f988526098f0d178eda4a Mon Sep 17 00:00:00 2001 From: tromey Date: Thu, 4 May 2000 15:50:34 +0000 Subject: * java/util/Locale.java (Locale): Don't explicitly check for null. * java/util/Hashtable.java (containsKey): Don't explicitly check for null. (get): Likewise. * java/util/BitSet.java (and, or, xor): Don't explicitly check for null. * java/util/zip/ZipEntry.java (ZipEntry): Don't explicitly check for null. * java/text/StringCharacterIterator.java (StringCharacterIterator): Don't check for null. * java/text/ChoiceFormat.java (setChoices): Don't explicitly check for null pointer. * java/net/MulticastSocket.java (joinGroup): Don't explicitly check for null pointer. (leaveGroup): Likewise. * java/net/DatagramPacket.java (DatagramPacket): Removed erroneous comment. (setData): Likewise. * java/lang/ThreadGroup.java (ThreadGroup): Don't explicitly check for `p==null'. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@33671 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/java/util/Hashtable.java | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) (limited to 'libjava/java/util/Hashtable.java') diff --git a/libjava/java/util/Hashtable.java b/libjava/java/util/Hashtable.java index 62866b08265..5b5361152f4 100644 --- a/libjava/java/util/Hashtable.java +++ b/libjava/java/util/Hashtable.java @@ -164,7 +164,8 @@ public class Hashtable extends Dictionary implements Cloneable, Serializable return newTable; } - public synchronized boolean contains(Object value) throws NullPointerException + public synchronized boolean contains(Object value) + throws NullPointerException { // An exception is thrown here according to the JDK 1.2 doc. if (value == null) @@ -180,10 +181,6 @@ public class Hashtable extends Dictionary implements Cloneable, Serializable public synchronized boolean containsKey(Object key) { - // The Map interface mandates that we throw this. - if (key == null) - throw new NullPointerException (); - for (HashtableEntry elem = bucket[Math.abs(key.hashCode() % bucket.length)]; elem != null; elem = elem.nextEntry) @@ -200,11 +197,6 @@ public class Hashtable extends Dictionary implements Cloneable, Serializable public synchronized Object get(Object key) { - // The Dictionary interface mandates that get() throw a - // NullPointerException if key is null. - if (key == null) - throw new NullPointerException (); - for (HashtableEntry elem = bucket[Math.abs (key.hashCode() % bucket.length)]; elem != null; elem = elem.nextEntry) @@ -225,8 +217,10 @@ public class Hashtable extends Dictionary implements Cloneable, Serializable } public synchronized Object put(Object key, Object value) - throws NullPointerException + throws NullPointerException { + // We could really just check `value == null', but checking both + // is a bit clearer. if (key == null || value == null) throw new NullPointerException(); -- cgit v1.2.1