Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-45 f3b49a553 -> a8505ff3d


# IGNITE-45 Fix NPE.


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

Branch: refs/heads/ignite-45
Commit: 99321a1adb54899bf65ac88e8c20ae51d41c6bc1
Parents: f3b49a5
Author: sevdokimov <sevdoki...@gridgain.com>
Authored: Thu Mar 19 17:02:22 2015 +0300
Committer: sevdokimov <sevdoki...@gridgain.com>
Committed: Thu Mar 19 17:02:22 2015 +0300

----------------------------------------------------------------------
 .../dht/preloader/GridDhtPartitionsExchangeFuture.java         | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/99321a1a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
index 56af218..73c7418 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
@@ -740,9 +740,13 @@ public class GridDhtPartitionsExchangeFuture extends 
GridFutureAdapter<AffinityT
         singleMsgs.clear();
         fullMsgs.clear();
         rcvdIds.clear();
-        rmtNodes.clear();
         oldestNode.set(null);
         partReleaseFut = null;
+
+        Collection<ClusterNode> rmtNodes = this.rmtNodes;
+
+        if (rmtNodes != null)
+            rmtNodes.clear();
     }
 
     /**

Reply via email to