FIX: Handling interrupt exception when blocking by future get.

naver · Oct 6, 2023 · c378476 · c378476
1 parent 7874b97
commit c378476
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/src/main/java/net/spy/memcached/MemcachedClient.java b/src/main/java/net/spy/memcached/MemcachedClient.java
@@ -616,6 +616,7 @@ public <T> CASResponse cas(String key, long casId, int exp, T value,
     try {
       return future.get(operationTimeout, TimeUnit.MILLISECONDS);
     } catch (InterruptedException e) {
+      Thread.currentThread().interrupt();
       future.cancel(true);
       throw new RuntimeException("Interrupted waiting for value", e);
     } catch (ExecutionException e) {
@@ -996,6 +997,7 @@ public <T> CASValue<T> gets(String key, Transcoder<T> tc) {
     try {
       return future.get(operationTimeout, TimeUnit.MILLISECONDS);
     } catch (InterruptedException e) {
+      Thread.currentThread().interrupt();
       future.cancel(true);
       throw new RuntimeException("Interrupted waiting for value", e);
     } catch (ExecutionException e) {
@@ -1038,6 +1040,7 @@ public <T> T get(String key, Transcoder<T> tc) {
     try {
       return future.get(operationTimeout, TimeUnit.MILLISECONDS);
     } catch (InterruptedException e) {
+      Thread.currentThread().interrupt();
       future.cancel(true);
       throw new RuntimeException("Interrupted waiting for value", e);
     } catch (ExecutionException e) {
@@ -1387,6 +1390,7 @@ public <T> Map<String, T> getBulk(Collection<String> keys,
     try {
       return future.get(operationTimeout, TimeUnit.MILLISECONDS);
     } catch (InterruptedException e) {
+      Thread.currentThread().interrupt();
       future.cancel(true);
       throw new RuntimeException("Interrupted getting bulk values", e);
     } catch (ExecutionException e) {
@@ -1460,6 +1464,7 @@ public <T> Map<String, CASValue<T>> getsBulk(Collection<String> keys,
     try {
       return future.get(operationTimeout, TimeUnit.MILLISECONDS);
     } catch (InterruptedException e) {
+      Thread.currentThread().interrupt();
       future.cancel(true);
       throw new RuntimeException("Interrupted getting bulk values", e);
     } catch (ExecutionException e) {
@@ -1555,6 +1560,7 @@ public void complete() {
     try {
       rv = future.get(operationTimeout, TimeUnit.MILLISECONDS);
     } catch (InterruptedException e) {
+      Thread.currentThread().interrupt();
       throw new RuntimeException("Interrupted waiting for versions", e);
     } catch (ExecutionException e) {
       throw new RuntimeException(e);
@@ -1628,6 +1634,7 @@ public void complete() {
     try {
       rv = future.get(operationTimeout, TimeUnit.MILLISECONDS);
     } catch (InterruptedException e) {
+      Thread.currentThread().interrupt();
       throw new RuntimeException("Interrupted waiting for stats", e);
     } catch (ExecutionException e) {
       throw new RuntimeException(e);

diff --git a/src/main/java/net/spy/memcached/internal/BTreeStoreAndGetFuture.java b/src/main/java/net/spy/memcached/internal/BTreeStoreAndGetFuture.java
@@ -50,6 +50,7 @@ public Element<E> getElement() {
     } catch (ExecutionException e) {
       throw new RuntimeException(e);
     } catch (InterruptedException e) {
+      Thread.currentThread().interrupt();
       throw new RuntimeException(e);
     } catch (TimeoutException e) {
       throw new OperationTimeoutException(e);