diff -r 29f58b0d4f78 -r bdec5d53e98c jdk/src/share/classes/java/util/WeakHashMap.java --- a/jdk/src/share/classes/java/util/WeakHashMap.java Fri Dec 20 09:58:03 2013 +0000 +++ b/jdk/src/share/classes/java/util/WeakHashMap.java Fri Dec 20 13:38:13 2013 +0100 @@ -1097,8 +1097,8 @@ public KeySpliterator trySplit() { int hi = getFence(), lo = index, mid = (lo + hi) >>> 1; return (lo >= mid) ? null : - new KeySpliterator(map, lo, index = mid, est >>>= 1, - expectedModCount); + new KeySpliterator<>(map, lo, index = mid, est >>>= 1, + expectedModCount); } public void forEachRemaining(Consumer action) { @@ -1177,8 +1177,8 @@ public ValueSpliterator trySplit() { int hi = getFence(), lo = index, mid = (lo + hi) >>> 1; return (lo >= mid) ? null : - new ValueSpliterator(map, lo, index = mid, est >>>= 1, - expectedModCount); + new ValueSpliterator<>(map, lo, index = mid, est >>>= 1, + expectedModCount); } public void forEachRemaining(Consumer action) { @@ -1254,8 +1254,8 @@ public EntrySpliterator trySplit() { int hi = getFence(), lo = index, mid = (lo + hi) >>> 1; return (lo >= mid) ? null : - new EntrySpliterator(map, lo, index = mid, est >>>= 1, - expectedModCount); + new EntrySpliterator<>(map, lo, index = mid, est >>>= 1, + expectedModCount); } @@ -1286,7 +1286,7 @@ @SuppressWarnings("unchecked") K k = (K) WeakHashMap.unmaskNull(x); action.accept - (new AbstractMap.SimpleImmutableEntry(k, v)); + (new AbstractMap.SimpleImmutableEntry<>(k, v)); } } } while (p != null || i < hi); @@ -1312,7 +1312,7 @@ @SuppressWarnings("unchecked") K k = (K) WeakHashMap.unmaskNull(x); action.accept - (new AbstractMap.SimpleImmutableEntry(k, v)); + (new AbstractMap.SimpleImmutableEntry<>(k, v)); if (map.modCount != expectedModCount) throw new ConcurrentModificationException(); return true;