From dce544c18af983702ec1a23cb1bd4b428ae9d00a Mon Sep 17 00:00:00 2001 From: Nikita Date: Tue, 3 Jul 2018 14:15:55 +0300 Subject: [PATCH] Fixed - RedissonRateLimiter acquire() blocks forever #1524 --- .../main/java/org/redisson/RedissonRateLimiter.java | 2 +- .../java/org/redisson/RedissonRateLimiterTest.java | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/redisson/src/main/java/org/redisson/RedissonRateLimiter.java b/redisson/src/main/java/org/redisson/RedissonRateLimiter.java index 81eeaaaa6..992bd175e 100644 --- a/redisson/src/main/java/org/redisson/RedissonRateLimiter.java +++ b/redisson/src/main/java/org/redisson/RedissonRateLimiter.java @@ -153,7 +153,7 @@ public class RedissonRateLimiter extends RedissonObject implements RRateLimiter public void run() { tryAcquireAsync(permits, promise, timeoutInMillis); } - }, delay, TimeUnit.SECONDS); + }, delay, TimeUnit.MILLISECONDS); return; } diff --git a/redisson/src/test/java/org/redisson/RedissonRateLimiterTest.java b/redisson/src/test/java/org/redisson/RedissonRateLimiterTest.java index 8c391c88f..441c4c0ed 100644 --- a/redisson/src/test/java/org/redisson/RedissonRateLimiterTest.java +++ b/redisson/src/test/java/org/redisson/RedissonRateLimiterTest.java @@ -19,11 +19,11 @@ public class RedissonRateLimiterTest extends BaseTest { @Test public void testAcquire() { - RRateLimiter rr = redisson.getRateLimiter("test"); - assertThat(rr.trySetRate(RateType.OVERALL, 10, 1, RateIntervalUnit.SECONDS)).isTrue(); - rr.acquire(1); - rr.acquire(5); - rr.acquire(4); + RRateLimiter rr = redisson.getRateLimiter("acquire"); + assertThat(rr.trySetRate(RateType.OVERALL, 1, 5, RateIntervalUnit.SECONDS)).isTrue(); + for (int i = 0; i < 10; i++) { + rr.acquire(1); + } assertThat(rr.tryAcquire()).isFalse(); }