Fixed - RLock.unlock() method hangs forever. #2355

0d4ec96d · Nikita Koksharov · 3a509310 · 0d4ec96d
隐藏空白更改
内联并排

Showing with 5 addition and 2 deletion

redisson/src/main/java/org/redisson/RedissonLock.java redisson/src/main/java/org/redisson/RedissonLock.java +5 -2

未找到文件。
--- a/redisson/src/main/java/org/redisson/RedissonLock.java
+++ b/redisson/src/main/java/org/redisson/RedissonLock.java
@@ -325,9 +325,12 @@ public class RedissonLock extends RedissonExpirable implements RLock {
        if (threadId != null) {
            task.removeThreadId(threadId);
        }
-        
+
        if (threadId == null || task.hasNoThreads()) {
-            task.getTimeout().cancel();
+            Timeout timeout = task.getTimeout();
+            if (timeout != null) {
+                timeout.cancel();
+            }
            EXPIRATION_RENEWAL_MAP.remove(getEntryName());
        }
    }