Repository: ignite
Updated Branches:
  refs/heads/ignite-6778 0884500c1 -> f46672ea2


IGNITE-6778 Fixed NPE


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

Branch: refs/heads/ignite-6778
Commit: f46672ea2898320cb83a749c1c67945a3b517fdd
Parents: 0884500
Author: Alexey Goncharuk <[email protected]>
Authored: Thu Nov 2 11:59:09 2017 +0300
Committer: Alexey Goncharuk <[email protected]>
Committed: Thu Nov 2 11:59:09 2017 +0300

----------------------------------------------------------------------
 .../ignite/internal/processors/cache/GridCacheUtils.java     | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/f46672ea/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
index eb0d9aa..53fb4d3 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
@@ -1691,9 +1691,11 @@ public class GridCacheUtils {
             if 
(dsCfg.getDefaultDataRegionConfiguration().isPersistenceEnabled())
                 return true;
 
-            for (DataRegionConfiguration drConf : 
dsCfg.getDataRegionConfigurations()) {
-                if (drConf.isPersistenceEnabled())
-                    return true;
+            if (dsCfg.getDataRegionConfigurations() != null) {
+                for (DataRegionConfiguration drConf : 
dsCfg.getDataRegionConfigurations()) {
+                    if (drConf.isPersistenceEnabled())
+                        return true;
+                }
             }
 
             return false;

Reply via email to