You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@apache.org on 2026/10/12 13:58:53 UTC
(tomcat) 22/22: Compatibility
This is an automated email from the ASF dual-hosted git repository.
rmaucher pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit f0aaafd92fbbd58c2ae3782915232f67f47f653a
Author: remm <re...@apache.org>
AuthorDate: Mon Oct 12 15:58:15 2026 +0200
Compatibility
---
java/org/apache/catalina/valves/ParameterLimitValve.java | 2 +-
.../apache/catalina/valves/TestExtendedAccessLogValveElements.java | 2 +-
.../catalina/valves/rewrite/TestRandomizedTextRewriteMap.java | 7 ++++---
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/java/org/apache/catalina/valves/ParameterLimitValve.java b/java/org/apache/catalina/valves/ParameterLimitValve.java
index 666306354b..4fc1d5bafd 100644
--- a/java/org/apache/catalina/valves/ParameterLimitValve.java
+++ b/java/org/apache/catalina/valves/ParameterLimitValve.java
@@ -282,7 +282,7 @@ public class ParameterLimitValve extends ValveBase {
containerLog.error(sm.getString("parameterLimitValve.readError"), ioe);
}
// Do not apply the limits parsed before the error
- return Map.of();
+ return Collections.emptyMap();
}
return newLimits;
}
diff --git a/test/org/apache/catalina/valves/TestExtendedAccessLogValveElements.java b/test/org/apache/catalina/valves/TestExtendedAccessLogValveElements.java
index 041623596c..69d25e0575 100644
--- a/test/org/apache/catalina/valves/TestExtendedAccessLogValveElements.java
+++ b/test/org/apache/catalina/valves/TestExtendedAccessLogValveElements.java
@@ -39,7 +39,7 @@ public class TestExtendedAccessLogValveElements {
Assert.assertNull(request.getContext());
CharArrayWriter buf = new CharArrayWriter();
- element.addElement(buf, request, null, 0);
+ element.addElement(buf, null, request, null, 0);
Assert.assertEquals("-", buf.toString());
}
diff --git a/test/org/apache/catalina/valves/rewrite/TestRandomizedTextRewriteMap.java b/test/org/apache/catalina/valves/rewrite/TestRandomizedTextRewriteMap.java
index 68aa20b1e1..f39abcb6a5 100644
--- a/test/org/apache/catalina/valves/rewrite/TestRandomizedTextRewriteMap.java
+++ b/test/org/apache/catalina/valves/rewrite/TestRandomizedTextRewriteMap.java
@@ -17,9 +17,8 @@
package org.apache.catalina.valves.rewrite;
import java.io.File;
+import java.io.FileWriter;
import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
import java.util.HashSet;
import java.util.Set;
@@ -31,7 +30,9 @@ public class TestRandomizedTextRewriteMap {
private String createMapFile(String content) throws IOException {
File file = File.createTempFile("rewrite-map", ".txt");
file.deleteOnExit();
- Files.writeString(file.toPath(), content, StandardCharsets.UTF_8);
+ try (FileWriter writer = new FileWriter(file)) {
+ writer.write(content);
+ }
return file.getAbsolutePath();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org