ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [16/50] [abbrv] ignite git commit: ignite-1.5 Fix for NPE in GridCachePartitionExchangeManager.processFullPartitionUpdate.
Date Fri, 11 Dec 2015 10:00:21 GMT
ignite-1.5 Fix for NPE in GridCachePartitionExchangeManager.processFullPartitionUpdate.


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

Branch: refs/heads/master
Commit: e1554df4511eedf15b9471ca3f078a9d6c475129
Parents: 2089b78
Author: sboikov <sboikov@gridgain.com>
Authored: Fri Dec 11 09:52:25 2015 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Fri Dec 11 09:52:25 2015 +0300

----------------------------------------------------------------------
 .../dht/preloader/GridDhtPartitionsFullMessage.java          | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/e1554df4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java
index 3f4f9bc..0cbdc91 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java
@@ -159,8 +159,14 @@ public class GridDhtPartitionsFullMessage extends GridDhtPartitionsAbstractMessa
         if (partsBytes != null && parts == null)
             parts = ctx.marshaller().unmarshal(partsBytes, ldr);
 
-        if (partCntrsBytes != null)
+        if (parts == null)
+            parts = new HashMap<>();
+
+        if (partCntrsBytes != null && partCntrs == null)
             partCntrs = ctx.marshaller().unmarshal(partCntrsBytes, ldr);
+
+        if (partCntrs == null)
+            partCntrs = new HashMap<>();
     }
 
     /** {@inheritDoc} */


Mime
View raw message