(tomcat) branch 9.0.x updated: Fix backport

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/9.0.x by this push:
     new cf9497b5a9 Fix backport
cf9497b5a9 is described below

commit cf9497b5a99c0a3efdacb130b8045b99ff77856b
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Apr 10 11:26:19 2025 +0100

    Fix backport
---
 test/org/apache/catalina/util/TestFilterUtil.java | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/test/org/apache/catalina/util/TestFilterUtil.java 
b/test/org/apache/catalina/util/TestFilterUtil.java
index 3af9c409a6..3a56fd5757 100644
--- a/test/org/apache/catalina/util/TestFilterUtil.java
+++ b/test/org/apache/catalina/util/TestFilterUtil.java
@@ -17,16 +17,15 @@
 package org.apache.catalina.util;
 
 import java.io.IOException;
-import java.nio.charset.StandardCharsets;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import jakarta.servlet.FilterChain;
-import jakarta.servlet.GenericFilter;
-import jakarta.servlet.GenericServlet;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.ServletRequest;
-import jakarta.servlet.ServletResponse;
-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.FilterChain;
+import javax.servlet.GenericFilter;
+import javax.servlet.GenericServlet;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletResponse;
 
 import org.junit.Assert;
 import org.junit.Test;
@@ -114,7 +113,7 @@ public class TestFilterUtil extends TomcatBaseTest {
         @Override
         public void service(ServletRequest req, ServletResponse res) throws 
ServletException, IOException {
             res.setContentType("text/plain");
-            res.setCharacterEncoding(StandardCharsets.UTF_8);
+            res.setCharacterEncoding("UTF-8");
             res.getWriter().print("OK");
         }
     }


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org