Fix exception when getting writer with invalid charset

Signed-off-by: Arjan Tijms <arjan.tijms@gmail.com>
eclipse-ee4j · Apr 7, 2022 · 76a7d62 · 76a7d62
1 parent c781be7
commit 76a7d62
Showing 1 changed file with 15 additions and 5 deletions.
diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/connector/ResponseFacade.java b/appserver/web/web-core/src/main/java/org/apache/catalina/connector/ResponseFacade.java
@@ -22,6 +22,8 @@
 
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.io.UnsupportedEncodingException;
+import java.nio.charset.UnsupportedCharsetException;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 import java.security.PrivilegedActionException;
@@ -138,12 +140,20 @@ public ServletOutputStream getOutputStream() throws IOException {
     public PrintWriter getWriter() throws IOException {
         checkResponseNull();
 
-        PrintWriter writer = response.getWriter();
-        if (isFinished()) {
-            response.setSuspended(true);
-        }
+        try {
+            PrintWriter writer = response.getWriter();
+            if (isFinished()) {
+                response.setSuspended(true);
+            }
 
-        return writer;
+            return writer;
+        } catch (UnsupportedCharsetException e) {
+            // Servlet 6 states we should throw an UnsupportedEncodingException, but our backend
+            // naturally throws an UnsupportedCharsetException.
+            UnsupportedEncodingException unsupportedEncodingException = new UnsupportedEncodingException();
+            unsupportedEncodingException.initCause(e);
+            throw unsupportedEncodingException;
+        }
     }
 
     @Override