# IGNITE-56 Fix catching of IgniteTxTimeoutException.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0bbcffdf Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0bbcffdf Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0bbcffdf Branch: refs/heads/ignite-51 Commit: 0bbcffdf1158a23aa823cd3b336d6acf862079bf Parents: 68a23d9 Author: sevdokimov <sergey.evdoki...@jetbrains.com> Authored: Sun Feb 8 21:05:10 2015 +0300 Committer: sevdokimov <sergey.evdoki...@jetbrains.com> Committed: Sun Feb 8 21:05:10 2015 +0300 ---------------------------------------------------------------------- .../cache/distributed/IgniteTxTimeoutAbstractTest.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0bbcffdf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxTimeoutAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxTimeoutAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxTimeoutAbstractTest.java index 0733c60..1e570ac 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxTimeoutAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxTimeoutAbstractTest.java @@ -23,6 +23,7 @@ import org.apache.ignite.internal.transactions.*; import org.apache.ignite.testframework.junits.common.*; import org.apache.ignite.transactions.*; +import javax.cache.*; import java.util.*; import static org.apache.ignite.transactions.IgniteTxConcurrency.*; @@ -146,7 +147,10 @@ public class IgniteTxTimeoutAbstractTest extends GridCommonAbstractTest { assert false : "Timeout never happened for transaction: " + tx; } - catch (IgniteTxTimeoutException e) { + catch (CacheException e) { + if (!(e.getCause() instanceof IgniteTxTimeoutException)) + throw e; + info("Received expected timeout exception [msg=" + e.getMessage() + ", tx=" + tx + ']'); } finally {
