infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-15 21:05:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

8013649: HashMap spliterator tryAdvance() encounters remaining elements after forEachRemaining()

Browse Source 
Reviewed-by: chegar
This commit is contained in:
Paul Sandoz 2013-05-31 10:53:19 +02:00
parent 049fc8b7b0
commit f2224939ec
3 changed files with 46 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
jdk/src/share/classes/java/util/HashMap.java
View File

@ -2701,8 +2701,10 @@ public class HashMap<K,V>
action.accept(m.nullKeyEntry.key);
}
}
if (tab.length >= hi && (i = index) >= 0 && i < (index = hi)) {
if (tab.length >= hi && (i = index) >= 0 &&
(i < (index = hi) || current != null)) {
Object p = current;
current = null;
do {
if (p == null) {
p = tab[i++];
@ -2815,8 +2817,10 @@ public class HashMap<K,V>
action.accept(m.nullKeyEntry.value);
}
}
if (tab.length >= hi && (i = index) >= 0 && i < (index = hi)) {
if (tab.length >= hi && (i = index) >= 0 &&
(i < (index = hi) || current != null)) {
Object p = current;
current = null;
do {
if (p == null) {
p = tab[i++];
@ -2928,8 +2932,10 @@ public class HashMap<K,V>
action.accept(m.nullKeyEntry);
}
}
if (tab.length >= hi && (i = index) >= 0 && i < (index = hi)) {
if (tab.length >= hi && (i = index) >= 0 &&
(i < (index = hi) || current != null)) {
Object p = current;
current = null;
do {
if (p == null) {
p = tab[i++];

15
jdk/src/share/classes/java/util/WeakHashMap.java
View File

@ -1100,9 +1100,10 @@ public class WeakHashMap<K,V>
}
else
mc = expectedModCount;
if (tab.length >= hi && (i = index) >= 0 && i < hi) {
index = hi;
if (tab.length >= hi && (i = index) >= 0 &&
(i < (index = hi) || current != null)) {
WeakHashMap.Entry<K,V> p = current;
current = null; // exhaust
do {
if (p == null)
p = tab[i++];
@ -1179,9 +1180,10 @@ public class WeakHashMap<K,V>
}
else
mc = expectedModCount;
if (tab.length >= hi && (i = index) >= 0 && i < hi) {
index = hi;
if (tab.length >= hi && (i = index) >= 0 &&
(i < (index = hi) || current != null)) {
WeakHashMap.Entry<K,V> p = current;
current = null; // exhaust
do {
if (p == null)
p = tab[i++];
@ -1256,9 +1258,10 @@ public class WeakHashMap<K,V>
}
else
mc = expectedModCount;
if (tab.length >= hi && (i = index) >= 0 && i < hi) {
index = hi;
if (tab.length >= hi && (i = index) >= 0 &&
(i < (index = hi) || current != null)) {
WeakHashMap.Entry<K,V> p = current;
current = null; // exhaust
do {
if (p == null)
p = tab[i++];

28
jdk/test/java/util/Spliterator/SpliteratorTraversingAndSplittingTest.java
View File

@ -128,6 +128,10 @@ public class SpliteratorTraversingAndSplittingTest {
void addMap(Function<Map<T, T>, ? extends Map<T, T>> m) {
String description = "new " + m.apply(Collections.<T, T>emptyMap()).getClass().getName();
addMap(m, description);
}
void addMap(Function<Map<T, T>, ? extends Map<T, T>> m, String description) {
add(description + ".keySet().spliterator()", () -> m.apply(mExp).keySet().spliterator());
add(description + ".values().spliterator()", () -> m.apply(mExp).values().spliterator());
add(description + ".entrySet().spliterator()", mExp.entrySet(), () -> m.apply(mExp).entrySet().spliterator());
@ -399,12 +403,36 @@ public class SpliteratorTraversingAndSplittingTest {
db.addMap(HashMap::new);
db.addMap(m -> {
// Create a Map ensuring that for large sizes
// buckets will contain 2 or more entries
HashMap<Integer, Integer> cm = new HashMap<>(1, m.size() + 1);
// Don't use putAll which inflates the table by
// m.size() * loadFactor, thus creating a very sparse
// map for 1000 entries defeating the purpose of this test,
// in addition it will cause the split until null test to fail
// because the number of valid splits is larger than the
// threshold
for (Map.Entry<Integer, Integer> e : m.entrySet())
cm.put(e.getKey(), e.getValue());
return cm;
}, "new java.util.HashMap(1, size + 1)");
db.addMap(LinkedHashMap::new);
db.addMap(IdentityHashMap::new);
db.addMap(WeakHashMap::new);
db.addMap(m -> {
// Create a Map ensuring that for large sizes
// buckets will be consist of 2 or more entries
WeakHashMap<Integer, Integer> cm = new WeakHashMap<>(1, m.size() + 1);
for (Map.Entry<Integer, Integer> e : m.entrySet())
cm.put(e.getKey(), e.getValue());
return cm;
}, "new java.util.WeakHashMap(1, size + 1)");
// @@@ Descending maps etc
db.addMap(TreeMap::new);