refactoring

redisson · Aug 11, 2016 · 2874e75 · 2874e75
1 parent 984fda8
commit 2874e75
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/redisson/src/main/java/org/redisson/RedissonBoundedBlockingQueue.java b/redisson/src/main/java/org/redisson/RedissonBoundedBlockingQueue.java
@@ -137,6 +137,7 @@ private Promise<V> wrapTakeFuture(final Future<V> takeFuture) {
         final Promise<V> result = new PromiseDelegator<V>(commandExecutor.getConnectionManager().<V>newPromise()) {
             @Override
             public boolean cancel(boolean mayInterruptIfRunning) {
+                super.cancel(mayInterruptIfRunning);
                 return takeFuture.cancel(mayInterruptIfRunning);
             };
         };
@@ -145,14 +146,14 @@ public boolean cancel(boolean mayInterruptIfRunning) {
             @Override
             public void operationComplete(Future<V> future) throws Exception {
                 if (!future.isSuccess()) {
-                    result.setFailure(future.cause());
+                    result.tryFailure(future.cause());
                     return;
                 }
 
                 createSemaphore(null).releaseAsync().addListener(new FutureListener<Void>() {
                     @Override
                     public void operationComplete(Future<Void> future) throws Exception {
-                        result.setSuccess(takeFuture.getNow());
+                        result.trySuccess(takeFuture.getNow());
                     }
                 });
             }

diff --git a/redisson/src/main/java/org/redisson/RedissonRemoteService.java b/redisson/src/main/java/org/redisson/RedissonRemoteService.java
@@ -273,7 +273,7 @@ public void operationComplete(Future<RemoteServiceCancelRequest> future) throws
     private <T> void invokeMethod(final Class<T> remoteInterface,
             final RBlockingQueue<RemoteServiceRequest> requestQueue, final RemoteServiceRequest request,
             RemoteServiceMethod method, String responseName, final ExecutorService executor,
-            Future<RemoteServiceCancelRequest> cancelRequestFuture, AtomicReference<RRemoteServiceResponse> responseHolder) {
+            Future<RemoteServiceCancelRequest> cancelRequestFuture, final AtomicReference<RRemoteServiceResponse> responseHolder) {
         try {
             Object result = method.getMethod().invoke(method.getBean(), request.getArgs());
 
@@ -454,7 +454,7 @@ public void operationComplete(Future<Boolean> future) throws Exception {
                         }
 
                         if (optionsCopy.isAckExpected()) {
-                            RBlockingQueue<RemoteServiceAck> responseQueue = redisson.getBlockingQueue(responseName, getCodec());
+                            final RBlockingQueue<RemoteServiceAck> responseQueue = redisson.getBlockingQueue(responseName, getCodec());
                             Future<RemoteServiceAck> ackFuture = responseQueue.pollAsync(optionsCopy.getAckTimeoutInMillis(), TimeUnit.MILLISECONDS);
                             ackFuture.addListener(new FutureListener<RemoteServiceAck>() {
                                 @Override