This is an automated email from the ASF dual-hosted git repository.
isapir pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new ec6d300738 RateLimitFilter code cleanup per commit feedback
ec6d300738 is described below
commit ec6d3007380076664435d85c66c5f05473f36d3e
Author: Igal Sapir <[email protected]>
AuthorDate: Sun Oct 6 13:24:23 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 6a6e9d67a8..c9f5c83c7c 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 jakarta.servlet.FilterChain;
import jakarta.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 d07389c58c..693c41642b 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: [email protected]
For additional commands, e-mail: [email protected]
