diff options
| author | Bryce McKinlay <bryce@albatross.co.nz> | 2001-02-22 04:16:07 +0000 |
|---|---|---|
| committer | Bryce McKinlay <bryce@gcc.gnu.org> | 2001-02-22 04:16:07 +0000 |
| commit | 810e8b5200c3e59dddb0fb5e43d46290ec400927 (patch) | |
| tree | 6bf010a67cccbe03b819b7320a3cd43e49919b7a /libjava/java/util/HashMap.java | |
| parent | 7a6f7290413b2209ab01506a2a832eb3f9d3ca8b (diff) | |
| download | gcc-810e8b5200c3e59dddb0fb5e43d46290ec400927.zip gcc-810e8b5200c3e59dddb0fb5e43d46290ec400927.tar.gz gcc-810e8b5200c3e59dddb0fb5e43d46290ec400927.tar.bz2 | |
re PR java/2040 (java.util.Hashtable(int,float) is stricter than sun's version)
Fix for PR java/2040:
* java/util/HashMap.java (HashMap): Don't throw exception for
loadFactor > 1. Add exception messages.
* java/util/Hashtable.java (Hashtable): Likewise.
From-SVN: r39969
Diffstat (limited to 'libjava/java/util/HashMap.java')
| -rw-r--r-- | libjava/java/util/HashMap.java | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/libjava/java/util/HashMap.java b/libjava/java/util/HashMap.java index 6304333..bf10e9e 100644 --- a/libjava/java/util/HashMap.java +++ b/libjava/java/util/HashMap.java @@ -60,8 +60,6 @@ import java.io.ObjectOutputStream; * @author Jon Zeppieri * @author Jochen Hoenicke * @author Bryce McKinlay - * @version $Revision: 1.4 $ - * @modified $Id: HashMap.java,v 1.4 2000/12/21 02:00:15 bryce Exp $ */ public class HashMap extends AbstractMap implements Map, Cloneable, Serializable @@ -160,14 +158,16 @@ public class HashMap extends AbstractMap * * @throws IllegalArgumentException if (initialCapacity < 0) || * (initialLoadFactor > 1.0) || - * (initialLoadFactor <= 0.0) */ public HashMap(int initialCapacity, float loadFactor) throws IllegalArgumentException { - if (initialCapacity < 0 || loadFactor <= 0 || loadFactor > 1) - throw new IllegalArgumentException(); - + if (initialCapacity < 0) + throw new IllegalArgumentException("Illegal Initial Capacity: " + + initialCapacity); + if (loadFactor <= 0) + throw new IllegalArgumentException("Illegal Load Factor: " + loadFactor); + buckets = new Entry[initialCapacity]; this.loadFactor = loadFactor; this.threshold = (int) (initialCapacity * loadFactor); @@ -619,8 +619,6 @@ public class HashMap extends AbstractMap * keys, values, or entries. * * @author Jon Zeppieri - * @version $Revision: 1.4 $ - * @modified $Id: HashMap.java,v 1.4 2000/12/21 02:00:15 bryce Exp $ */ class HashIterator implements Iterator { |