Fixed NPE in "onNodeLeft" method.

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

Branch: refs/heads/ignite-2926
Commit: 6b9d65197900c3e2b0de64b94686e4bfdf559975
Parents: 5646ef0
Author: vozerov-gridgain <[email protected]>
Authored: Tue Apr 19 16:08:42 2016 +0300
Committer: vozerov-gridgain <[email protected]>
Committed: Tue Apr 19 16:08:42 2016 +0300

----------------------------------------------------------------------
 .../distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/6b9d6519/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java
index 7a95640..abfc5c9 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java
@@ -128,7 +128,8 @@ public class GridNearAtomicSingleUpdateFuture extends 
GridNearAtomicAbstractUpda
         GridNearAtomicUpdateResponse res = null;
 
         synchronized (mux) {
-            GridNearAtomicUpdateRequest req = this.req.nodeId().equals(nodeId) 
? this.req : null;
+            GridNearAtomicUpdateRequest req = this.req != null && 
this.req.nodeId().equals(nodeId) ?
+                this.req : null;
 
             if (req != null && req.response() == null) {
                 res = new GridNearAtomicUpdateResponse(cctx.cacheId(),

Reply via email to