[ignite] branch master updated: IGNITE-11253 Fixed handling of IgniteInterruptedCheckedException and InterruptedException

[agura]

This is an automated email from the ASF dual-hosted git repository.

agura pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git


The following commit(s) were added to refs/heads/master by this push:
     new f52031d  IGNITE-11253 Fixed handling of 
IgniteInterruptedCheckedException and InterruptedException
f52031d is described below

commit f52031d4049cd38673c0c7d974d1a57764aeba2b
Author: sk0x50 <slava.kopti...@gmail.com>
AuthorDate: Wed Feb 13 16:20:51 2019 +0300

    IGNITE-11253 Fixed handling of IgniteInterruptedCheckedException and 
InterruptedException
    
    Signed-off-by: Andrey Gura <ag...@apache.org>
---
 .../internal/processors/cache/GridCacheSharedTtlCleanupManager.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedTtlCleanupManager.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedTtlCleanupManager.java
index 3f64f56..2254c5e 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedTtlCleanupManager.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedTtlCleanupManager.java
@@ -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;