src/share/classes/java/util/concurrent/ConcurrentHashMap.java
Print this page
rev 7682 : 8021591: Additional explicit null checks
Reviewed-by: duke
@@ -48,10 +48,11 @@
import java.util.HashMap;
import java.util.Hashtable;
import java.util.Iterator;
import java.util.Map;
import java.util.NoSuchElementException;
+import java.util.Objects;
import java.util.Set;
import java.util.Spliterator;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.ForkJoinPool;
import java.util.concurrent.atomic.AtomicReference;
@@ -4409,10 +4410,11 @@
}
return true;
}
public final boolean removeAll(Collection<?> c) {
+ Objects.requireNonNull(c);
boolean modified = false;
for (Iterator<E> it = iterator(); it.hasNext();) {
if (c.contains(it.next())) {
it.remove();
modified = true;
@@ -4420,10 +4422,11 @@
}
return modified;
}
public final boolean retainAll(Collection<?> c) {
+ Objects.requireNonNull(c);
boolean modified = false;
for (Iterator<E> it = iterator(); it.hasNext();) {
if (!c.contains(it.next())) {
it.remove();
modified = true;