diff options
| author | Stuart Ballard <stuart.ballard@corp.fast.net> | 2003-11-26 21:45:55 +0000 |
|---|---|---|
| committer | Michael Koch <mkoch@gcc.gnu.org> | 2003-11-26 21:45:55 +0000 |
| commit | 32ffbe9280fddada892bdd1c0f79479170a12610 (patch) | |
| tree | b857ce5d013437441b7802f8fe68371d767cbd24 /libjava/java/util/HashMap.java | |
| parent | cb5599c77a0be19736dd8be35a1b136aa6ecee52 (diff) | |
| download | gcc-32ffbe9280fddada892bdd1c0f79479170a12610.zip gcc-32ffbe9280fddada892bdd1c0f79479170a12610.tar.gz gcc-32ffbe9280fddada892bdd1c0f79479170a12610.tar.bz2 | |
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
Diffstat (limited to 'libjava/java/util/HashMap.java')
| -rw-r--r-- | libjava/java/util/HashMap.java | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/libjava/java/util/HashMap.java b/libjava/java/util/HashMap.java index 6b3466c..6317ba7 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); |