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 041c531d54a0826289585a0e1799a7583294b9bb Author: remm <[email protected]> AuthorDate: Wed Sep 30 20:58:53 2026 +0200 Fix compilation errors --- java/org/apache/catalina/filters/CsrfPreventionFilterBase.java | 4 ++-- java/org/apache/catalina/filters/RateLimitFilter.java | 4 ++-- test/org/apache/catalina/valves/TestRemoteIpValve.java | 6 ++++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/java/org/apache/catalina/filters/CsrfPreventionFilterBase.java b/java/org/apache/catalina/filters/CsrfPreventionFilterBase.java index b5abf953da..17fdd6ccba 100644 --- a/java/org/apache/catalina/filters/CsrfPreventionFilterBase.java +++ b/java/org/apache/catalina/filters/CsrfPreventionFilterBase.java @@ -89,8 +89,8 @@ public abstract class CsrfPreventionFilterBase extends FilterBase { try { Class<?> clazz = Class.forName(randomClass); Object instance = clazz.getConstructor().newInstance(); - if (instance instanceof Random random) { - randomSource = random; + if (instance instanceof Random) { + randomSource = (Random) instance; } else { throw new ServletException(sm.getString("csrfPrevention.invalidRandomClass", randomClass)); } diff --git a/java/org/apache/catalina/filters/RateLimitFilter.java b/java/org/apache/catalina/filters/RateLimitFilter.java index ea3be37f01..d1dfd2b6ee 100644 --- a/java/org/apache/catalina/filters/RateLimitFilter.java +++ b/java/org/apache/catalina/filters/RateLimitFilter.java @@ -255,8 +255,8 @@ public class RateLimitFilter extends FilterBase { try { Object instance = Class.forName(rateLimitClassName).getConstructor().newInstance(); - if (instance instanceof RateLimiter limiter) { - rateLimiter = limiter; + if (instance instanceof RateLimiter) { + rateLimiter = (RateLimiter) instance; } else { throw new ServletException(sm.getString("rateLimitFilter.classNotFound", rateLimitClassName)); } diff --git a/test/org/apache/catalina/valves/TestRemoteIpValve.java b/test/org/apache/catalina/valves/TestRemoteIpValve.java index 71b963df03..9616e0e571 100644 --- a/test/org/apache/catalina/valves/TestRemoteIpValve.java +++ b/test/org/apache/catalina/valves/TestRemoteIpValve.java @@ -918,7 +918,8 @@ public class TestRemoteIpValve { RemoteAddrAndHostTrackerValve remoteAddrAndHostTrackerValve = new RemoteAddrAndHostTrackerValve(); remoteIpValve.setNext(remoteAddrAndHostTrackerValve); - Request request = new MockRequest(new org.apache.coyote.Request()); + Request request = new MockRequest(); + request.setCoyoteRequest(new org.apache.coyote.Request()); // client ip request.setRemoteAddr("192.168.0.10"); request.setRemoteHost("192.168.0.10"); @@ -951,7 +952,8 @@ public class TestRemoteIpValve { RemoteAddrAndHostTrackerValve remoteAddrAndHostTrackerValve = new RemoteAddrAndHostTrackerValve(); remoteIpValve.setNext(remoteAddrAndHostTrackerValve); - Request request = new MockRequest(new org.apache.coyote.Request()); + Request request = new MockRequest(); + request.setCoyoteRequest(new org.apache.coyote.Request()); // client ip request.setRemoteAddr("192.168.0.10"); request.setRemoteHost("192.168.0.10"); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
