From cea3398cd97628d3bef709b20fdbaa3add0c26b3 Mon Sep 17 00:00:00 2001
From: Bauke Scholtz <balusc@gmail.com>
Date: Mon, 12 Feb 2024 06:56:32 -0400
Subject: [PATCH] Default encoding should be prechecked
 https://github.com/eclipse-ee4j/mojarra/issues/5383

---
 impl/src/main/java/com/sun/faces/util/Util.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/impl/src/main/java/com/sun/faces/util/Util.java b/impl/src/main/java/com/sun/faces/util/Util.java
index 5289d39f71..ca481492aa 100644
--- a/impl/src/main/java/com/sun/faces/util/Util.java
+++ b/impl/src/main/java/com/sun/faces/util/Util.java
@@ -1677,7 +1677,9 @@ public static String getResponseEncoding(FacesContext context, Optional<String>
 
         if (encoding == null) {
             // 5. If still none found then fall back to specified default.
-            encoding = defaultEncoding.get();
+            if (defaultEncoding.isPresent()) {
+                encoding = defaultEncoding.get();
+            }
 
             if (encoding != null && !encoding.isBlank()) {
                 if (LOGGER.isLoggable(FINEST)) {