Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 714A1200D2B for ; Thu, 2 Nov 2017 09:59:19 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 6FC7E160BFB; Thu, 2 Nov 2017 08:59:19 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id B5D5A160BE5 for ; Thu, 2 Nov 2017 09:59:18 +0100 (CET) Received: (qmail 43604 invoked by uid 500); 2 Nov 2017 08:59:17 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 43595 invoked by uid 99); 2 Nov 2017 08:59:17 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Nov 2017 08:59:17 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D04FFDFA0C; Thu, 2 Nov 2017 08:59:17 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: agoncharuk@apache.org To: commits@ignite.apache.org Message-Id: <64121118612f416dbbef76dcb6ac33fa@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: ignite git commit: IGNITE-6778 Fixed NPE Date: Thu, 2 Nov 2017 08:59:17 +0000 (UTC) archived-at: Thu, 02 Nov 2017 08:59:19 -0000 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 Authored: Thu Nov 2 11:59:09 2017 +0300 Committer: Alexey Goncharuk 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;