IGNITE-11253 Fixed handling of IgniteInterruptedCheckedException and InterruptedException
authorsk0x50 <slava.koptilin@gmail.com>
Wed, 13 Feb 2019 13:20:51 +0000 (16:20 +0300)
committerAndrey Gura <agura@apache.org>
Wed, 13 Feb 2019 13:20:51 +0000 (16:20 +0300)
Signed-off-by: Andrey Gura <agura@apache.org>
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedTtlCleanupManager.java

index 3f64f56..2254c5e 100644 (file)
@@ -22,6 +22,7 @@ import java.util.concurrent.CopyOnWriteArrayList;
 import org.apache.ignite.configuration.CacheConfiguration;
 import org.apache.ignite.failure.FailureContext;
 import org.apache.ignite.internal.IgniteInterruptedCheckedException;
+import org.apache.ignite.internal.util.typedef.X;
 import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.internal.util.worker.GridWorker;
 import org.apache.ignite.thread.IgniteThread;
@@ -163,7 +164,7 @@ public class GridCacheSharedTtlCleanupManager extends GridCacheSharedManagerAdap
                 }
             }
             catch (Throwable t) {
-                if (!(t instanceof IgniteInterruptedCheckedException))
+                if (!(X.hasCause(t, IgniteInterruptedCheckedException.class, InterruptedException.class)))
                     err = t;
 
                 throw t;