ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ag...@apache.org
Subject ignite git commit: IGNITE-7983: NPE fixed in transactions
Date Thu, 12 Apr 2018 18:33:26 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-2.5 dfe170745 -> fe9949752


IGNITE-7983: NPE fixed in transactions

Signed-off-by: Andrey Gura <agura@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fe994975
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fe994975
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fe994975

Branch: refs/heads/ignite-2.5
Commit: fe99497528cd040ab3b4d5f7bfc40e788393a5ed
Parents: dfe1707
Author: Andrey Kuznetsov <stkuzma@gmail.com>
Authored: Thu Apr 12 21:23:28 2018 +0300
Committer: Andrey Gura <agura@apache.org>
Committed: Thu Apr 12 21:25:08 2018 +0300

----------------------------------------------------------------------
 .../processors/cache/distributed/near/GridNearTxLocal.java  | 9 +++++++++
 1 file changed, 9 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/fe994975/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;
                 }
             },


Mime
View raw message