IGNITE-7983: NPE fixed in transactions Signed-off-by: Andrey Gura <ag...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/08a700db Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/08a700db Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/08a700db Branch: refs/heads/ignite-7708 Commit: 08a700db31604d33959e3b5aa3f709dbf66a878b Parents: adaedb4 Author: Andrey Kuznetsov <stku...@gmail.com> Authored: Thu Apr 12 21:23:28 2018 +0300 Committer: Andrey Gura <ag...@apache.org> Committed: Thu Apr 12 21:23:28 2018 +0300 ---------------------------------------------------------------------- .../processors/cache/distributed/near/GridNearTxLocal.java | 9 +++++++++ 1 file changed, 9 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/08a700db/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java index 33f84f0..fc8a9a3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java @@ -3916,6 +3916,15 @@ public class GridNearTxLocal extends GridDhtTxLocalAdapter implements GridTimeou throw new GridClosureException(e); } + if (isRollbackOnly()) { + if (timedOut()) + throw new GridClosureException(new IgniteTxTimeoutCheckedException( + "Transaction has been timed out: " + GridNearTxLocal.this)); + else + throw new GridClosureException(new IgniteTxRollbackCheckedException( + "Transaction has been rolled back: " + GridNearTxLocal.this)); + } + return map; } },
