From fcd144215671be13581e0bf23f94914aba19c2a7 Mon Sep 17 00:00:00 2001 From: Nikita Date: Thu, 2 Jan 2014 19:19:57 +0400 Subject: [PATCH] RedissonLock.tryLock with timeout fixed --- src/main/java/org/redisson/RedissonLock.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/redisson/RedissonLock.java b/src/main/java/org/redisson/RedissonLock.java index b46b84c83..ae437b74a 100644 --- a/src/main/java/org/redisson/RedissonLock.java +++ b/src/main/java/org/redisson/RedissonLock.java @@ -95,7 +95,10 @@ public class RedissonLock implements Lock { while (!tryLock()) { long current = System.currentTimeMillis(); // waiting for message - msg.tryAcquire(time, TimeUnit.MILLISECONDS); + boolean res = msg.tryAcquire(time, TimeUnit.MILLISECONDS); + if (res) { + return true; + } long elapsed = System.currentTimeMillis() - current; time -= elapsed; if (time <= 0) {