ISPN-6680 Handle InterruptedException in the server

infinispan · Jun 13, 2016 · 3062bd9 · 3062bd9
1 parent 747b99a
commit 3062bd9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/core/src/main/java/org/infinispan/interceptors/impl/InvocationContextInterceptor.java b/core/src/main/java/org/infinispan/interceptors/impl/InvocationContextInterceptor.java
@@ -61,7 +61,7 @@ public CompletableFuture<Object> handle(InvocationContext rCtx, VisitableCommand
          if (throwable == null)
             return null;
 
-         if (throwable instanceof InvalidCacheUsageException) {
+         if (throwable instanceof InvalidCacheUsageException || throwable instanceof InterruptedException) {
             throw throwable;
          } else {
             rethrowException(rCtx, rCommand, throwable);

diff --git a/server/hotrod/src/main/scala/org/infinispan/server/hotrod/Decoder2x.scala b/server/hotrod/src/main/scala/org/infinispan/server/hotrod/Decoder2x.scala
@@ -400,8 +400,10 @@ object Decoder2x extends AbstractVersionedDecoder with Log with Constants {
             // JGroups and remote exceptions (inside RemoteException) can come wrapped up
             case _ : org.jgroups.SuspectedException => createNodeSuspectedErrorResponse(h, t)
             case _ : IllegalLifecycleStateException => createIllegalLifecycleStateErrorResponse(h, t)
+            case _: InterruptedException => createIllegalLifecycleStateErrorResponse(h, t)
             case _ => createServerErrorResponse(h, t)
          }
+         case _: InterruptedException => createIllegalLifecycleStateErrorResponse(h, t)
          case p: PrivilegedActionException => createErrorResponse(h, p.getCause)
          case t: Throwable => createServerErrorResponse(h, t)
       }