From 161dd1c2d2d3835b80f2e0ee4370c82f59ecf691 Mon Sep 17 00:00:00 2001
From: Nikita <abracham.mitchell@gmail.com>
Date: Mon, 19 Oct 2015 20:07:00 +0300
Subject: [PATCH] minor fixes

---
 src/main/java/org/redisson/RedissonCountDownLatch.java | 4 ++--
 src/main/java/org/redisson/RedissonLock.java           | 7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/redisson/RedissonCountDownLatch.java b/src/main/java/org/redisson/RedissonCountDownLatch.java
index fc8fbe5eb..a852aee57 100644
--- a/src/main/java/org/redisson/RedissonCountDownLatch.java
+++ b/src/main/java/org/redisson/RedissonCountDownLatch.java
@@ -97,9 +97,9 @@ public class RedissonCountDownLatch extends RedissonObject implements RCountDown
 
             @Override
             public boolean onStatus(PubSubType type, String channel) {
-                if (channel.equals(getChannelName()) && !value.getPromise().isSuccess()
+                if (channel.equals(getChannelName())
                         && type == PubSubType.SUBSCRIBE) {
-                    value.getPromise().setSuccess(value);
+                    value.getPromise().trySuccess(value);
                     return true;
                 }
                 return false;
diff --git a/src/main/java/org/redisson/RedissonLock.java b/src/main/java/org/redisson/RedissonLock.java
index 513aa0fbd..3ad768f30 100644
--- a/src/main/java/org/redisson/RedissonLock.java
+++ b/src/main/java/org/redisson/RedissonLock.java
@@ -104,9 +104,8 @@ public class RedissonLock extends RedissonExpirable implements RLock {
                 @Override
                 public boolean onStatus(PubSubType type, String channel) {
                     if (channel.equals(getChannelName())
-                            && !value.getPromise().isSuccess()
-                                && type == PubSubType.SUBSCRIBE) {
-                        value.getPromise().setSuccess(value);
+                            && type == PubSubType.SUBSCRIBE) {
+                        value.getPromise().trySuccess(value);
                         return true;
                     }
                     return false;
@@ -161,7 +160,7 @@ public class RedissonLock extends RedissonExpirable implements RLock {
         }
 
         Future<RedissonLockEntry> future = subscribe();
-        future.awaitUninterruptibly();
+        future.syncUninterruptibly();
 
         try {
             while (true) {