Fixed - zero timeout isn't respected in RRateLimiter.tryAcquire method. #2149

redisson/src/main/java/org/redisson/RedissonRateLimiter.java

@@ -126,7 +126,7 @@ public class RedissonRateLimiter extends RedissonObject implements RRateLimiter
     public RFuture<Boolean> tryAcquireAsync(long permits, long timeout, TimeUnit unit) {
         RPromise<Boolean> promise = new RedissonPromise<Boolean>();
         long timeoutInMillis = -1;
-        if (timeout > 0) {
+        if (timeout >= 0) {
             timeoutInMillis = unit.toMillis(timeout);
         }
         tryAcquireAsync(permits, promise, timeoutInMillis);

redisson/src/test/java/org/redisson/RedissonRateLimiterTest.java

@@ -37,6 +37,39 @@ public class RedissonRateLimiterTest extends BaseTest {
         Assertions.assertThatThrownBy(() -> limiter.tryAcquire(20)).hasMessageContaining("Requested permits amount could not exceed defined rate");
         assertThat(limiter.tryAcquire()).isTrue();
     }
+
+    @Test
+    public void testZeroTimeout() throws InterruptedException {
+        RRateLimiter limiter = redisson.getRateLimiter("myLimiter");
+        limiter.trySetRate(RateType.OVERALL, 5, 1, RateIntervalUnit.SECONDS);
+        
+        assertThat(limiter.tryAcquire(1, 0, TimeUnit.SECONDS)).isTrue();
+        assertThat(limiter.tryAcquire(1, 0, TimeUnit.SECONDS)).isTrue();
+        assertThat(limiter.tryAcquire(1, 0, TimeUnit.SECONDS)).isTrue();
+        assertThat(limiter.tryAcquire(1, 0, TimeUnit.SECONDS)).isTrue();
+        assertThat(limiter.tryAcquire(1, 0, TimeUnit.SECONDS)).isTrue();
+        
+        assertThat(limiter.tryAcquire(1, 0, TimeUnit.SECONDS)).isFalse();
+        assertThat(limiter.tryAcquire(1, 0, TimeUnit.SECONDS)).isFalse();
+        assertThat(limiter.tryAcquire(1, 0, TimeUnit.SECONDS)).isFalse();
+        assertThat(limiter.tryAcquire(1, 0, TimeUnit.SECONDS)).isFalse();
+        assertThat(limiter.tryAcquire(1, 0, TimeUnit.SECONDS)).isFalse();
+        
+        Thread.sleep(1000);
+        
+        assertThat(limiter.tryAcquire(1, 0, TimeUnit.SECONDS)).isTrue();
+        assertThat(limiter.tryAcquire(1, 0, TimeUnit.SECONDS)).isTrue();
+        assertThat(limiter.tryAcquire(1, 0, TimeUnit.SECONDS)).isTrue();
+        assertThat(limiter.tryAcquire(1, 0, TimeUnit.SECONDS)).isTrue();
+        assertThat(limiter.tryAcquire(1, 0, TimeUnit.SECONDS)).isTrue();
+        
+        assertThat(limiter.tryAcquire(1, 0, TimeUnit.SECONDS)).isFalse();
+        assertThat(limiter.tryAcquire(1, 0, TimeUnit.SECONDS)).isFalse();
+        assertThat(limiter.tryAcquire(1, 0, TimeUnit.SECONDS)).isFalse();
+        assertThat(limiter.tryAcquire(1, 0, TimeUnit.SECONDS)).isFalse();
+        assertThat(limiter.tryAcquire(1, 0, TimeUnit.SECONDS)).isFalse();
+    }
+    
     
     @Test(timeout = 1500)
     public void testTryAcquire() {