This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 52f8cd3eef Fix backport
52f8cd3eef is described below
commit 52f8cd3eefd40e08b3d9c968341b0e4fb24494ae
Author: Mark Thomas <[email protected]>
AuthorDate: Wed May 18 11:37:54 2022 +0100
Fix backport
---
test/javax/servlet/http/HttpServletDoHeadBaseTest.java | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/test/javax/servlet/http/HttpServletDoHeadBaseTest.java
b/test/javax/servlet/http/HttpServletDoHeadBaseTest.java
index 9a75d87260..1317502c93 100644
--- a/test/javax/servlet/http/HttpServletDoHeadBaseTest.java
+++ b/test/javax/servlet/http/HttpServletDoHeadBaseTest.java
@@ -134,16 +134,15 @@ public class HttpServletDoHeadBaseTest extends
TomcatBaseTest {
this.explicitFlush = explicitFlush;
}
- @SuppressWarnings("removal")
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
int adjustedBufferSize = bufferSize;
- if
(Boolean.parseBoolean(getServletConfig().getInitParameter(LEGACY_DO_HEAD)) &&
- useWriter && JreCompat.isJre19Available()) {
+ if (useWriter && JreCompat.isJre19Available()) {
/*
- * Using legacy HEAD handling with a Writer on Java 19+.
+ * Using legacy (non-legacy isn't available until Servlet 6.0 /
+ * Tomcat 10.1.x) HEAD handling with a Writer on Java 19+.
* HttpServlet wraps the response. The test is sensitive to
* buffer sizes. The size of the buffer HttpServlet uses varies
* with Java version. For the tests to pass the number of
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
