# HG changeset patch
# User simonis
# Date 1486656381 -3600
#      Thu Feb 09 17:06:21 2017 +0100
# Node ID 4bf614e36abc851190e77a486c293db5781686a8
# Parent  cad3932c20ec7e4b26e6c4adc2fb34376ade27cd
8033909: Objects.requireNonNull(T, Supplier) doesn't specify what happens if the passed supplier is null itself

diff --git a/src/java.base/share/classes/java/util/Objects.java b/src/java.base/share/classes/java/util/Objects.java
--- a/src/java.base/share/classes/java/util/Objects.java
+++ b/src/java.base/share/classes/java/util/Objects.java
@@ -343,7 +343,8 @@
      */
     public static <T> T requireNonNull(T obj, Supplier<String> messageSupplier) {
         if (obj == null)
-            throw new NullPointerException(messageSupplier.get());
+            throw new NullPointerException(messageSupplier == null ?
+                                           null : messageSupplier.get());
         return obj;
     }