Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-gg-9615 00913e0f5 -> 3e54e2c28


# Fixed potential NPE in GridCachePartitionExchangeManager.dumpDebugInfo


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

Branch: refs/heads/ignite-gg-9615
Commit: bd770a54a554c8c22f36ea00f8c735218c29b330
Parents: d9acbd1
Author: sboikov <sboi...@gridgain.com>
Authored: Mon Aug 10 16:08:10 2015 +0300
Committer: sboikov <sboi...@gridgain.com>
Committed: Mon Aug 10 16:08:10 2015 +0300

----------------------------------------------------------------------
 .../cache/GridCachePartitionExchangeManager.java    | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd770a54/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
index c26f5c3..cf49197 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
@@ -962,15 +962,19 @@ public class GridCachePartitionExchangeManager<K, V> 
extends GridCacheSharedMana
         for (GridDhtPartitionsExchangeFuture fut : pendingExchangeFuts)
             U.warn(log, ">>> " + fut);
 
-        U.warn(log, "Last 10 exchange futures (total: " + exchFuts.size() + 
"):");
+        ExchangeFutureSet exchFuts = this.exchFuts;
 
-        int cnt = 0;
+        if (exchFuts != null) {
+            U.warn(log, "Last 10 exchange futures (total: " + exchFuts.size() 
+ "):");
 
-        for (GridDhtPartitionsExchangeFuture fut : exchFuts) {
-            U.warn(log, ">>> " + fut);
+            int cnt = 0;
+
+            for (GridDhtPartitionsExchangeFuture fut : exchFuts) {
+                U.warn(log, ">>> " + fut);
 
-            if (++cnt == 10)
-                break;
+                if (++cnt == 10)
+                    break;
+            }
         }
 
         dumpPendingObjects();

Reply via email to