Merge
diff --git a/src/share/classes/java/util/Collections.java b/src/share/classes/java/util/Collections.java
index f236077..3e1d72f 100644
--- a/src/share/classes/java/util/Collections.java
+++ b/src/share/classes/java/util/Collections.java
@@ -3497,6 +3497,7 @@
*/
@Override
public void replaceAll(UnaryOperator<E> operator) {
+ Objects.requireNonNull(operator);
list.replaceAll(e -> typeCheck(operator.apply(e)));
}
diff --git a/test/java/util/Collections/CheckedListReplaceAll.java b/test/java/util/Collections/CheckedListReplaceAll.java
index 8ac05d0..19042db 100644
--- a/test/java/util/Collections/CheckedListReplaceAll.java
+++ b/test/java/util/Collections/CheckedListReplaceAll.java
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 8047795
+ * @bug 8047795 8053938
* @summary Ensure that replaceAll operator cannot add bad elements
* @author Mike Duigou
*/
@@ -46,5 +46,16 @@
thwarted.printStackTrace(System.out);
System.out.println("Curses! Foiled again!");
}
+
+ unwrapped = Arrays.asList(new Object[]{}); // Empty list
+ wrapped = Collections.checkedList(unwrapped, Integer.class);
+ try {
+ wrapped.replaceAll((UnaryOperator)null);
+ System.out.printf("Bwahaha! I have defeated you! %s\n", wrapped);
+ throw new RuntimeException("NPE not thrown when passed a null operator");
+ } catch (NullPointerException thwarted) {
+ thwarted.printStackTrace(System.out);
+ System.out.println("Curses! Foiled again!");
+ }
}
}