#ignite-180: Fix NullPointerException in DataStructuresProcessor.

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

Branch: refs/heads/ignite-366
Commit: 8f6e7a624306cbf184f7879c8f0169a3755ed1e4
Parents: 079186a
Author: ivasilinets <ivasilin...@gridgain.com>
Authored: Tue Apr 7 13:45:01 2015 +0300
Committer: ivasilinets <ivasilin...@gridgain.com>
Committed: Tue Apr 7 13:45:01 2015 +0300

----------------------------------------------------------------------
 .../processors/datastructures/DataStructuresProcessor.java        | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8f6e7a62/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
index 5150bcd..1a9ea23 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
@@ -1242,6 +1242,9 @@ public final class DataStructuresProcessor extends 
GridProcessorAdapter {
      * @return Name of the cache with compatible configuration or null.
      */
     private static String findCompatibleConfiguration(CollectionConfiguration 
cfg, List<CacheCollectionInfo> infos) {
+        if (infos == null)
+            return null;
+
         for (CacheCollectionInfo col : infos) {
             if (col.cfg.getAtomicityMode() == cfg.getAtomicityMode() &&
                 col.cfg.getMemoryMode() == cfg.getMemoryMode() &&

Reply via email to