From 1ae409781cabd4da5a4b07822e9555bdd581ebf0 Mon Sep 17 00:00:00 2001 From: mkoch Date: Wed, 26 Nov 2003 21:45:55 +0000 Subject: 2003-11-26 Stuart Ballard * java/util/HashMap.java (putAll): Use Iterator hasNext() method. (putAllInternal): Likewise. * java/util/Hashtable.java (putAll): Use Iterator hasNext() method. (putAllInternal): Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@73964 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/java/util/HashMap.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'libjava/java/util/HashMap.java') diff --git a/libjava/java/util/HashMap.java b/libjava/java/util/HashMap.java index 6b3466ca15d..6317ba7cec1 100644 --- 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); -- cgit v1.2.3