Fixed - RedissonRedLock.tryLock doesn't work for some wait time values. #1292

redisson/src/main/java/org/redisson/RedissonRedLock.java

@@ -51,7 +51,7 @@ public class RedissonRedLock extends RedissonMultiLock {
 
     @Override
     protected long calcLockWaitTime(long remainTime) {
-        return Math.max(remainTime / locks.size(), 1000);
+        return Math.max(remainTime / locks.size(), 1);
     }
     
     @Override

redisson/src/test/java/org/redisson/RedissonRedLockTest.java

@@ -157,6 +157,39 @@ public class RedissonRedLockTest {
         assertThat(redis2.stop()).isEqualTo(0);
     }
 
+    @Test
+    public void testLockSuccess2() throws IOException, InterruptedException {
+        RedisProcess redis1 = redisTestMultilockInstance();
+        RedisProcess redis2 = redisTestMultilockInstance();
+
+        RedissonClient client1 = createClient(redis1.getRedisServerAddressAndPort());
+        RedissonClient client2 = createClient(redis2.getRedisServerAddressAndPort());
+
+        RLock lock1 = client1.getLock("lock1");
+        RLock lock2 = client1.getLock("lock2");
+        RLock lock3 = client2.getLock("lock3");
+        
+        Thread t1 = new Thread() {
+            public void run() {
+                lock2.lock();
+            };
+        };
+        t1.start();
+        t1.join();
+        
+        RedissonMultiLock lock = new RedissonRedLock(lock1, lock2, lock3);
+
+        assertThat(lock.tryLock(500, 5000, TimeUnit.MILLISECONDS)).isTrue();
+        Thread.sleep(3000);
+        
+        lock.unlock();
+
+        client1.shutdown();
+        client2.shutdown();
+        
+        assertThat(redis1.stop()).isEqualTo(0);
+        assertThat(redis2.stop()).isEqualTo(0);        
+    }
     
     @Test
     public void testLockSuccess() throws IOException, InterruptedException {