src/share/classes/java/util/concurrent/ConcurrentHashMap.java

Print this page
rev 7932 : 8021591: Additional explicit null checks
Reviewed-by: psandoz, martin, alanb

*** 47,56 **** --- 47,57 ---- 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;
*** 4408,4417 **** --- 4409,4419 ---- } 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;
*** 4419,4428 **** --- 4421,4431 ---- } 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;