Merge pull request #663 from markt-asf/fix-issue-616

Fix #616 - avoid NPE
jakartaee · Jun 24, 2024 · 795442b · 795442b
2 parents 40d1588 + 45eddbb
commit 795442b
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/api/src/main/java/jakarta/servlet/ServletResponse.java b/api/src/main/java/jakarta/servlet/ServletResponse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023 Oracle and/or its affiliates and others.
+ * Copyright (c) 1997, 2024 Oracle and/or its affiliates and others.
  * All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
@@ -211,7 +211,11 @@ public interface ServletResponse {
      * @since Servlet 6.1
      */
     default void setCharacterEncoding(Charset encoding) {
-        setCharacterEncoding(encoding.name());
+        if (encoding == null) {
+            setCharacterEncoding((String) null);
+        } else {
+            setCharacterEncoding(encoding.name());
+        }
     }
 
     /**