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 fefdd5b1a8 Fix back-port
fefdd5b1a8 is described below
commit fefdd5b1a86789e8c0870952b2b4786e625db2f6
Author: Mark Thomas <[email protected]>
AuthorDate: Fri Aug 4 19:23:14 2023 +0100
Fix back-port
---
test/org/apache/coyote/http2/TestAsyncError.java | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/test/org/apache/coyote/http2/TestAsyncError.java
b/test/org/apache/coyote/http2/TestAsyncError.java
index 176e410ded..d04f839605 100644
--- a/test/org/apache/coyote/http2/TestAsyncError.java
+++ b/test/org/apache/coyote/http2/TestAsyncError.java
@@ -19,16 +19,15 @@ package org.apache.coyote.http2;
import java.io.IOException;
import java.io.PrintWriter;
import java.nio.ByteBuffer;
-import java.nio.charset.StandardCharsets;
import java.util.concurrent.atomic.AtomicInteger;
-import jakarta.servlet.AsyncContext;
-import jakarta.servlet.AsyncEvent;
-import jakarta.servlet.AsyncListener;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServlet;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.AsyncContext;
+import javax.servlet.AsyncEvent;
+import javax.servlet.AsyncListener;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import org.junit.Assert;
import org.junit.Test;
@@ -120,7 +119,7 @@ public class TestAsyncError extends Http2TestBase {
public void run() {
try {
resp.setContentType("text/plain");
- resp.setCharacterEncoding(StandardCharsets.UTF_8);
+ resp.setCharacterEncoding("UTF-8");
PrintWriter pw = resp.getWriter();
while (true) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
