ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject [3/3] incubator-ignite git commit: ignite-1093
Date Fri, 21 Aug 2015 09:21:16 GMT
ignite-1093


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

Branch: refs/heads/ignite-1093
Commit: a483f522042bda553492e240bc43e2691e19c691
Parents: c3d47ce
Author: Anton Vinogradov <vinogradov.anton@gmail.com>
Authored: Fri Aug 21 12:09:15 2015 +0300
Committer: Anton Vinogradov <vinogradov.anton@gmail.com>
Committed: Fri Aug 21 12:09:15 2015 +0300

----------------------------------------------------------------------
 .../dht/preloader/GridDhtPartitionDemander.java         | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a483f522/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java
index 73e1fed..e11addc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java
@@ -791,13 +791,15 @@ public class GridDhtPartitionDemander {
 
             Collection<Integer> parts = remaining.get(nodeId);
 
-            parts.remove(p);
+            if (parts!=null) {
+                parts.remove(p);
 
-            if (parts.isEmpty()) {
-                remaining.remove(nodeId);
+                if (parts.isEmpty()) {
+                    remaining.remove(nodeId);
 
-                if (log.isDebugEnabled())
-                    log.debug("Completed full partition iteration for node [nodeId=" + nodeId
+ ']');
+                    if (log.isDebugEnabled())
+                        log.debug("Completed full partition iteration for node [nodeId="
+ nodeId + ']');
+                }
             }
 
             checkIsDone();


Mime
View raw message