HashMap.java (putAll): Use Iterator hasNext() method.

2003-11-26  Stuart Ballard <stuart.ballard@corp.fast.net>

	* java/util/HashMap.java (putAll): Use Iterator hasNext() method.
	(putAllInternal): Likewise.
	* java/util/Hashtable.java (putAll): Use Iterator hasNext() method.
	(putAllInternal): Likewise.

From-SVN: r73964

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 23d9adc1d4f83301f8f99011f2133e3c3b2701d5..260c7ce12d65520e2eee55154aa62c95e3e3e23e 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,10 @@
+2003-11-26  Stuart Ballard <stuart.ballard@corp.fast.net>
+
+       * java/util/HashMap.java (putAll): Use Iterator hasNext() method.
+       (putAllInternal): Likewise.
+       * java/util/Hashtable.java (putAll): Use Iterator hasNext() method.
+       (putAllInternal): Likewise.
+
 2003-11-26  Michael Koch  <konqueror@gmx.de>
 
        * java/net/URLStreamHandler.java

diff --git a/libjava/java/util/HashMap.java b/libjava/java/util/HashMap.java
index 6b3466ca15d2b9adf15b0f436f587061521bff30..6317ba7cec1339db3a74c5f12d34416963867e37 100644 (file)
--- a/libjava/java/util/HashMap.java
+++ b/libjava/java/util/HashMap.java
@@ -381,8 +381,7 @@ public class HashMap extends AbstractMap
   public void putAll(Map m)
   {
     Iterator itr = m.entrySet().iterator();
-    int msize = m.size();
-    while (msize-- > 0)
+    while (itr.hasNext())
       {
         Map.Entry e = (Map.Entry) itr.next();
         // Optimize in case the Entry is one of our own.
@@ -709,10 +708,10 @@ public class HashMap extends AbstractMap
   void putAllInternal(Map m)
   {
     Iterator itr = m.entrySet().iterator();
-    int msize = m.size();
-    size = msize;
-    while (msize-- > 0)
+    size = 0;
+    while (itr.hasNext())
       {
+        size++;
        Map.Entry e = (Map.Entry) itr.next();
        Object key = e.getKey();
        int idx = hash(key);

diff --git a/libjava/java/util/Hashtable.java b/libjava/java/util/Hashtable.java
index a94143b8f09ae8ee0028988c86adadf1c6392993..b0de0a231b8cb03c87999f495d208bfd6a5ca548 100644 (file)
--- a/libjava/java/util/Hashtable.java
+++ b/libjava/java/util/Hashtable.java
@@ -510,7 +510,7 @@ public class Hashtable extends Dictionary
   {
     Iterator itr = m.entrySet().iterator();
 
-    for (int msize = m.size(); msize > 0; msize--)
+    while (itr.hasNext())
       {
         Map.Entry e = (Map.Entry) itr.next();
         // Optimize in case the Entry is one of our own.
@@ -859,11 +859,11 @@ public class Hashtable extends Dictionary
   void putAllInternal(Map m)
   {
     Iterator itr = m.entrySet().iterator();
-    int msize = m.size();
-    this.size = msize;
+    size = 0;
 
-    for (; msize > 0; msize--)
+    while (itr.hasNext())
       {
+        size++;
        Map.Entry e = (Map.Entry) itr.next();
        Object key = e.getKey();
        int idx = hash(key);