Merge pull request #5430 from TomasHofman/default-encoding-4.0

Backport: Default encoding should be prechecked
eclipse-ee4j · Mar 26, 2024 · c9192d6 · c9192d6
2 parents cb971c3 + cea3398
commit c9192d6
Showing 1 changed file with 3 additions and 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
@@ -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)) {