From 45eddbb96cf42a7b47ad776d39e8e73846d8580a Mon Sep 17 00:00:00 2001
From: Mark Thomas <markt@apache.org>
Date: Mon, 24 Jun 2024 18:13:57 +0100
Subject: [PATCH] Fix #616 - avoid NPE

---
 api/src/main/java/jakarta/servlet/ServletResponse.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/api/src/main/java/jakarta/servlet/ServletResponse.java b/api/src/main/java/jakarta/servlet/ServletResponse.java
index acc61c3ad..562e6eea0 100644
--- 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());
+        }
     }
 
     /**