summaryrefslogtreecommitdiff
path: root/libjava/java/util/HashMap.java
diff options
context:
space:
mode:
authorbryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4>2001-02-22 04:16:07 +0000
committerbryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4>2001-02-22 04:16:07 +0000
commit0c51f5a04d12dd9b53089cb4f3e05f05d0337a38 (patch)
tree6bf010a67cccbe03b819b7320a3cd43e49919b7a /libjava/java/util/HashMap.java
parent654eba20c7775727569b1e1fc58dad57cb36cd18 (diff)
downloadgcc-0c51f5a04d12dd9b53089cb4f3e05f05d0337a38.tar.gz
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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@39969 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/java/util/HashMap.java')
-rw-r--r--libjava/java/util/HashMap.java14
1 files changed, 6 insertions, 8 deletions
diff --git a/libjava/java/util/HashMap.java b/libjava/java/util/HashMap.java
index 6304333295e..bf10e9ef00a 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
{