From ccd5d9627c173f2ee8fe53377112d7308d22f7ab Mon Sep 17 00:00:00 2001
From: Nikita Koksharov <nkoksharov@redisson.pro>
Date: Tue, 29 Jan 2019 14:07:52 +0300
Subject: [PATCH] Fixed - CancellationException arise during promise cancel
 method invocation.

---
 .../src/main/java/org/redisson/misc/RedissonPromise.java    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/redisson/src/main/java/org/redisson/misc/RedissonPromise.java b/redisson/src/main/java/org/redisson/misc/RedissonPromise.java
index 3d4efc7fd..792eaf896 100644
--- a/redisson/src/main/java/org/redisson/misc/RedissonPromise.java
+++ b/redisson/src/main/java/org/redisson/misc/RedissonPromise.java
@@ -236,7 +236,11 @@ public class RedissonPromise<T> extends CompletableFuture<T> implements RPromise
         }
         if (status.compareAndSet(0, CANCELED)) {
             promise.cancel(mayInterruptIfRunning);
-            return super.cancel(mayInterruptIfRunning);
+            try {
+                return super.cancel(mayInterruptIfRunning);
+            } catch (CancellationException e) {
+                return true;
+            }
         }
         return false;
     }