Index: src/main/java/java/util/WeakHashMap.java =================================================================== --- src/main/java/java/util/WeakHashMap.java (revision 539313) +++ src/main/java/java/util/WeakHashMap.java (working copy) @@ -388,8 +388,11 @@ public Object[] toArray() { Collection coll = new ArrayList(size()); - for (Iterator iter = iterator(); iter.hasNext();) { - coll.add(iter.next()); + try { + for (Iterator iter = iterator(); iter.hasNext();) { + coll.add(iter.next()); + } + } catch (NoSuchElementException nsee) { } return coll.toArray(); } @@ -398,8 +401,11 @@ public T[] toArray(T[] contents) { Collection coll = new ArrayList(size()); - for (Iterator iter = iterator(); iter.hasNext();) { - coll.add(iter.next()); + try { + for (Iterator iter = iterator(); iter.hasNext();) { + coll.add(iter.next()); + } + } catch (NoSuchElementException nsee) { } return coll.toArray(contents); }