From 332995cc4bc72fb49228bc1ca36e0b815b6a6bc2 Mon Sep 17 00:00:00 2001 From: bryce Date: Sat, 24 Mar 2001 08:05:29 +0000 Subject: 2001-03-24 Bryce McKinlay * java/util/HashMap.java (HashMap): If 0 is given for initialCapacity paramater, bump it to 1. * java/util/Hashtable.java (Hashtable): Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@40812 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/java/util/HashMap.java | 6 ++++-- libjava/java/util/Hashtable.java | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'libjava/java/util') diff --git a/libjava/java/util/HashMap.java b/libjava/java/util/HashMap.java index bf10e9ef00a..4bc88b75570 100644 --- 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 4fd8167d60c..4475785bbbb 100644 --- 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); -- cgit v1.2.3