From 6b3dfcda8e16f1859fe592861a85a32fefe002d0 Mon Sep 17 00:00:00 2001 From: Gustavo Simon Date: Tue, 4 Mar 2025 13:32:06 -0300 Subject: [PATCH 1/5] 8350542: Optional.orElseThrow(Supplier) does not specify behavior when supplier returns null --- src/java.base/share/classes/java/util/Optional.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/java.base/share/classes/java/util/Optional.java b/src/java.base/share/classes/java/util/Optional.java index 21128fa980d09..e09740e16e4c2 100644 --- a/src/java.base/share/classes/java/util/Optional.java +++ b/src/java.base/share/classes/java/util/Optional.java @@ -393,8 +393,8 @@ public T orElseThrow() { * exception to be thrown * @return the value, if present * @throws X if no value is present - * @throws NullPointerException if no value is present and the exception - * supplying function is {@code null} + * @throws NullPointerException if no value is present and the exception + * supplying function or its result is {@code null} */ public T orElseThrow(Supplier exceptionSupplier) throws X { if (value != null) { From 69deb3c944768455750c9f74b6c126fde50f159d Mon Sep 17 00:00:00 2001 From: Gustavo Simon Date: Tue, 4 Mar 2025 13:40:46 -0300 Subject: [PATCH 2/5] 8350542: fix extra trailing space. --- src/java.base/share/classes/java/util/Optional.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/java.base/share/classes/java/util/Optional.java b/src/java.base/share/classes/java/util/Optional.java index e09740e16e4c2..bfe7d6d1a0105 100644 --- a/src/java.base/share/classes/java/util/Optional.java +++ b/src/java.base/share/classes/java/util/Optional.java @@ -393,7 +393,7 @@ public T orElseThrow() { * exception to be thrown * @return the value, if present * @throws X if no value is present - * @throws NullPointerException if no value is present and the exception + * @throws NullPointerException if no value is present and the exception * supplying function or its result is {@code null} */ public T orElseThrow(Supplier exceptionSupplier) throws X { From f96d78ee54e3bc0131b5c1842b34f729fdedf0e3 Mon Sep 17 00:00:00 2001 From: Gustavo Simon Date: Mon, 28 Apr 2025 18:08:05 -0300 Subject: [PATCH 3/5] 8350542: update orElseThrow JavaDoc from CSR specification. --- src/java.base/share/classes/java/util/Optional.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/java.base/share/classes/java/util/Optional.java b/src/java.base/share/classes/java/util/Optional.java index bfe7d6d1a0105..ee7df05af5e94 100644 --- a/src/java.base/share/classes/java/util/Optional.java +++ b/src/java.base/share/classes/java/util/Optional.java @@ -394,7 +394,7 @@ public T orElseThrow() { * @return the value, if present * @throws X if no value is present * @throws NullPointerException if no value is present and the exception - * supplying function or its result is {@code null} + * supplying function or produces a {@code null} result */ public T orElseThrow(Supplier exceptionSupplier) throws X { if (value != null) { From 53df7aff48e24af8127a98e28b35e0c630c3055c Mon Sep 17 00:00:00 2001 From: Gustavo Simon Date: Mon, 28 Apr 2025 18:10:04 -0300 Subject: [PATCH 4/5] 8350542: fix extra trailing space. --- src/java.base/share/classes/java/util/Optional.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/java.base/share/classes/java/util/Optional.java b/src/java.base/share/classes/java/util/Optional.java index ee7df05af5e94..1443fb0da201f 100644 --- a/src/java.base/share/classes/java/util/Optional.java +++ b/src/java.base/share/classes/java/util/Optional.java @@ -394,7 +394,7 @@ public T orElseThrow() { * @return the value, if present * @throws X if no value is present * @throws NullPointerException if no value is present and the exception - * supplying function or produces a {@code null} result + * supplying function or produces a {@code null} result */ public T orElseThrow(Supplier exceptionSupplier) throws X { if (value != null) { From 324487742d5b8c2b543e67ee7a8039594f31b624 Mon Sep 17 00:00:00 2001 From: Gustavo Simon Date: Mon, 28 Apr 2025 19:10:56 -0300 Subject: [PATCH 5/5] 8350542: update orElseThrow JavaDoc from CSR specification. --- src/java.base/share/classes/java/util/Optional.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/java.base/share/classes/java/util/Optional.java b/src/java.base/share/classes/java/util/Optional.java index 1443fb0da201f..e19dde6383ea2 100644 --- a/src/java.base/share/classes/java/util/Optional.java +++ b/src/java.base/share/classes/java/util/Optional.java @@ -394,7 +394,7 @@ public T orElseThrow() { * @return the value, if present * @throws X if no value is present * @throws NullPointerException if no value is present and the exception - * supplying function or produces a {@code null} result + * supplying function is {@code null} or produces a {@code null} result */ public T orElseThrow(Supplier exceptionSupplier) throws X { if (value != null) {