HashMap.java (HashMap): If 0 is given for initialCapacity paramater, bump it to 1.

2001-03-24  Bryce McKinlay  <bryce@albatross.co.nz>

	* java/util/HashMap.java (HashMap): If 0 is given for initialCapacity
	paramater, bump it to 1.
	* java/util/Hashtable.java (Hashtable): Likewise.

From-SVN: r40812

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index d68ec70734a6fdc5d6121e0383d58f713b544848..35218b3631825611ac9923115b69c075f4f4b277 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2001-03-24  Bryce McKinlay  <bryce@albatross.co.nz>
+
+       * java/util/HashMap.java (HashMap): If 0 is given for initialCapacity 
+       paramater, bump it to 1.
+       * java/util/Hashtable.java (Hashtable): Likewise.
+
 2001-03-23  Per Bothner  <per@bothner.com>
 
        * java/lang/natDouble.cc (parseDouble):  Cannot use errno to

diff --git a/libjava/java/util/HashMap.java b/libjava/java/util/HashMap.java
index bf10e9ef00ab373fd58fa4f8f4312a6f0253f9cb..4bc88b7557041cff3f244146450cdb6cbfabe173 100644 (file)
--- a/libjava/java/util/HashMap.java
+++ b/libjava/java/util/HashMap.java
@@ -157,7 +157,7 @@ public class HashMap extends AbstractMap
    * @param   loadFactor       the load factor
    * 
    * @throws   IllegalArgumentException    if (initialCapacity < 0) ||
-   *                                          (initialLoadFactor > 1.0) ||
+   *                                          (loadFactor <= 0)
    */
   public HashMap(int initialCapacity, float loadFactor)
     throws IllegalArgumentException
@@ -167,7 +167,9 @@ public class HashMap extends AbstractMap
                                         + initialCapacity);    
     if (loadFactor <= 0)
       throw new IllegalArgumentException("Illegal Load Factor: " + loadFactor);
-  
+
+    if (initialCapacity == 0)
+      initialCapacity = 1;
     buckets = new Entry[initialCapacity];
     this.loadFactor = loadFactor;
     this.threshold = (int) (initialCapacity * loadFactor);

diff --git a/libjava/java/util/Hashtable.java b/libjava/java/util/Hashtable.java
index 4fd8167d60cdfcfcee3208a129b0993f487dac0c..4475785bbbb4d34a219ccdb09f56f53024cfd6e4 100644 (file)
--- a/libjava/java/util/Hashtable.java
+++ b/libjava/java/util/Hashtable.java
@@ -179,7 +179,9 @@ public class Hashtable extends Dictionary
                                         + initialCapacity);    
     if (loadFactor <= 0)
       throw new IllegalArgumentException("Illegal Load Factor: " + loadFactor);
-     
+    
+    if (initialCapacity == 0)
+      initialCapacity = 1;    
     buckets = new Entry[initialCapacity];
     this.loadFactor = loadFactor;
     this.threshold = (int) (initialCapacity * loadFactor);