ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [31/50] [abbrv] ignite git commit: fixed NPE
Date Mon, 05 Dec 2016 14:41:53 GMT
fixed NPE


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

Branch: refs/heads/ignite-comm-balance-master
Commit: 8030a43423fcfb94eb90bad4e7f74e9be10f76f2
Parents: 852ba3b
Author: Yakov Zhdanov <yzhdanov@gridgain.com>
Authored: Thu Nov 24 11:34:23 2016 +0700
Committer: Yakov Zhdanov <yzhdanov@gridgain.com>
Committed: Thu Nov 24 11:34:23 2016 +0700

----------------------------------------------------------------------
 .../internal/processors/cache/transactions/IgniteTxHandler.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/8030a434/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 fbd8ce5..4b99079 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
@@ -686,7 +686,7 @@ public class IgniteTxHandler {
 
         IgniteInternalFuture<IgniteInternalTx> fut = finish(nodeId, null, req);
 
-        assert req.txState() != null || fut.error() != null ||
+        assert req.txState() != null || (fut != null && fut.error() != null) ||
             (ctx.tm().tx(req.version()) == null && ctx.tm().nearTx(req.version())
== null);
 
         return fut;


Mime
View raw message