Merge pull request #196 from hjyun328/develop

FIX: May produce NullPointerException when checking that the operatio…
naver · Mar 12, 2020 · 01f2377 · 01f2377
2 parents 55e7cbe + 347d198
commit 01f2377
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/main/java/net/spy/memcached/ArcusClient.java b/src/main/java/net/spy/memcached/ArcusClient.java
@@ -1111,7 +1111,7 @@ public Map<Integer, CollectionOperationStatus> get(long duration,
             throw new ExecutionException(op.getException());
           }
 
-          if (op.isCancelled()) {
+          if (op != null && op.isCancelled()) {
             throw new ExecutionException(new RuntimeException(op.getCancelCause()));
           }
         }
@@ -2453,7 +2453,7 @@ public List<SMGetElement<T>> get(long duration, TimeUnit units)
             throw new ExecutionException(op.getException());
           }
 
-          if (op.isCancelled()) {
+          if (op != null && op.isCancelled()) {
             throw new ExecutionException(new RuntimeException(
                     op.getCancelCause()));
           }
@@ -2711,7 +2711,7 @@ public List<SMGetElement<T>> get(long duration, TimeUnit units)
             throw new ExecutionException(op.getException());
           }
 
-          if (op.isCancelled()) {
+          if (op != null && op.isCancelled()) {
             throw new ExecutionException(new RuntimeException(op.getCancelCause()));
           }
         }
@@ -4114,7 +4114,7 @@ public Map<Integer, CollectionOperationStatus> get(long duration,
             throw new ExecutionException(op.getException());
           }
 
-          if (op.isCancelled()) {
+          if (op != null && op.isCancelled()) {
             throw new ExecutionException(new RuntimeException(op.getCancelCause()));
           }
         }
@@ -4391,7 +4391,7 @@ public Map<String, CollectionOperationStatus> get(long duration,
             throw new ExecutionException(op.getException());
           }
 
-          if (op.isCancelled()) {
+          if (op != null && op.isCancelled()) {
             throw new ExecutionException(new RuntimeException(op.getCancelCause()));
           }
         }

diff --git a/src/main/java/net/spy/memcached/internal/CollectionGetBulkFuture.java b/src/main/java/net/spy/memcached/internal/CollectionGetBulkFuture.java
@@ -69,7 +69,7 @@ public T get(long duration, TimeUnit units) throws InterruptedException, Timeout
       if (op != null && op.hasErrored()) {
         throw new ExecutionException(op.getException());
       }
-      if (op.isCancelled()) {
+      if (op != null && op.isCancelled()) {
         throw new ExecutionException(new RuntimeException(op.getCancelCause()));
       }
     }