Repository: ignite Updated Branches: refs/heads/ignite-1537 cc7aee0ca -> 184bc96b1
ignite-1.5 Should not wait on preloader sync future for system caches callbacks. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/184bc96b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/184bc96b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/184bc96b Branch: refs/heads/ignite-1537 Commit: 184bc96b171c580476c479e607d62ebb574d33eb Parents: cc7aee0 Author: sboikov <sboi...@gridgain.com> Authored: Mon Nov 30 16:14:57 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Mon Nov 30 16:14:57 2015 +0300 ---------------------------------------------------------------------- .../internal/processors/cache/transactions/IgniteTxHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/184bc96b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java index 91ebfd3..b25baf8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java @@ -434,7 +434,7 @@ public class IgniteTxHandler { tx0.setRollbackOnly(); // Just in case. if (!X.hasCause(e, IgniteTxOptimisticCheckedException.class) && - !X.hasCause(e, IgniteFutureCancelledException.class)) + !X.hasCause(e, IgniteFutureCancelledException.class) && !ctx.kernalContext().isStopping()) U.error(log, "Failed to prepare DHT transaction: " + tx0, e); } }
