This is an automated email from the ASF dual-hosted git repository. isapir 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 77c4d2c5ff RateLimitFilter code cleanup per commit feedback 77c4d2c5ff is described below commit 77c4d2c5fff7451c67c717fa6a2368e7e3f73a4b Author: Igal Sapir <isa...@apache.org> AuthorDate: Sun Oct 6 13:33:42 2024 -0700 RateLimitFilter code cleanup per commit feedback --- java/org/apache/catalina/filters/RateLimitFilter.java | 4 +--- test/org/apache/catalina/filters/TestRateLimitFilter.java | 7 +++---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/java/org/apache/catalina/filters/RateLimitFilter.java b/java/org/apache/catalina/filters/RateLimitFilter.java index 8b323b136d..44d70add50 100644 --- a/java/org/apache/catalina/filters/RateLimitFilter.java +++ b/java/org/apache/catalina/filters/RateLimitFilter.java @@ -18,7 +18,6 @@ package org.apache.catalina.filters; import java.io.IOException; -import java.lang.reflect.InvocationTargetException; import javax.servlet.FilterChain; import javax.servlet.FilterConfig; @@ -166,8 +165,7 @@ public class RateLimitFilter extends FilterBase { try { rateLimiter = (RateLimiter)Class.forName(rateLimitClassName).getConstructor().newInstance(); - } catch (InstantiationException | IllegalAccessException | InvocationTargetException | - NoSuchMethodException | ClassNotFoundException e) { + } catch (ReflectiveOperationException e) { throw new ServletException(e); } diff --git a/test/org/apache/catalina/filters/TestRateLimitFilter.java b/test/org/apache/catalina/filters/TestRateLimitFilter.java index c43a85b395..92005cf403 100644 --- a/test/org/apache/catalina/filters/TestRateLimitFilter.java +++ b/test/org/apache/catalina/filters/TestRateLimitFilter.java @@ -56,11 +56,10 @@ public class TestRateLimitFilter extends TomcatBaseTest { MockFilterChain filterChain = new MockFilterChain(); RateLimitFilter rateLimitFilter = testRateLimitFilter(filterDef, root); - FastRateLimiter tbc = (FastRateLimiter) rateLimitFilter.rateLimiter; + FastRateLimiter fastRateLimiter = (FastRateLimiter) rateLimitFilter.rateLimiter; - int allowedRequests = (int) Math.round(tbc.getBucketCounter().getRatio() * bucketRequests); - - long sleepTime = tbc.getBucketCounter().getMillisUntilNextBucket(); + int allowedRequests = fastRateLimiter.getRequests(); + long sleepTime = fastRateLimiter.getBucketCounter().getMillisUntilNextBucket(); System.out.printf("Sleeping %d millis for the next time bucket to start\n", Long.valueOf(sleepTime)); Thread.sleep(sleepTime); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org