Mercurial > hg > openjdk > lambda > jdk

changeset 9549:67e00b862126

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
FIx for 8023367 Collections.emptyList().sort((Comparator)null) throws NPE
author psandoz
date Tue, 20 Aug 2013 17:36:15 +0200
parents 146f75962536
children c30b320faa97
files src/share/classes/java/util/Collections.java test/java/util/Collection/ListDefaults.java
diffstat 2 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/java/util/Collections.java	Mon Aug 19 16:50:07 2013 -0700
+++ b/src/share/classes/java/util/Collections.java	Tue Aug 20 17:36:15 2013 +0200
@@ -4529,7 +4529,6 @@
         }
         @Override
         public void sort(Comparator<? super E> c) {
-            Objects.requireNonNull(c);
         }
 
         // Override default methods in Collection
--- a/test/java/util/Collection/ListDefaults.java	Mon Aug 19 16:50:07 2013 -0700
+++ b/test/java/util/Collection/ListDefaults.java	Tue Aug 20 17:36:15 2013 +0200
@@ -49,6 +49,7 @@
 
 /**
  * @test
+ * @bug 8023367
  * @library testlibrary
  * @build CollectionAsserts CollectionSupplier
  * @run testng ListDefaults
@@ -100,6 +101,7 @@
     @DataProvider(name="listProvider", parallel=true)
     public static Object[][] listCases() {
         final List<Object[]> cases = new LinkedList<>();
+        cases.add(new Object[] { Collections.emptyList() });
         cases.add(new Object[] { new ArrayList<>() });
         cases.add(new Object[] { new LinkedList<>() });
         cases.add(new Object[] { new Vector<>() });
@@ -128,6 +130,11 @@
             list.removeIf(null);
             fail("expected NPE not thrown");
         } catch (NullPointerException npe) {}
+        try {
+            list.sort(null);
+        } catch (Throwable t) {
+            fail("Exception not expected: " + t);
+        }
     }
 
     @Test