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 7E4B8200C4E for ; Fri, 21 Apr 2017 17:41:05 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 7D08B160BA2; Fri, 21 Apr 2017 15:41:05 +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 5DB86160B97 for ; Fri, 21 Apr 2017 17:41:04 +0200 (CEST) Received: (qmail 31053 invoked by uid 500); 21 Apr 2017 15:41:03 -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 31044 invoked by uid 99); 21 Apr 2017 15:41:03 -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; Fri, 21 Apr 2017 15:41:03 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0D9D0ED4A1; Fri, 21 Apr 2017 15:41:03 +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: <4caa7a38793a4d849b327104d4267756@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: ignite git commit: ignite-2.0 - Fixed NPE Date: Fri, 21 Apr 2017 15:41:03 +0000 (UTC) archived-at: Fri, 21 Apr 2017 15:41:05 -0000 Repository: ignite Updated Branches: refs/heads/ignite-2.0 32379ee4c -> a4d914843 ignite-2.0 - Fixed NPE Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a4d91484 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a4d91484 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a4d91484 Branch: refs/heads/ignite-2.0 Commit: a4d91484384ff2e0323fa9375083621e87d2f5e2 Parents: 32379ee Author: Alexander Paschenko Authored: Fri Apr 21 18:41:27 2017 +0300 Committer: Alexey Goncharuk Committed: Fri Apr 21 18:41:27 2017 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/query/GridQueryProcessor.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/a4d91484/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java index 0ac55e6..015646d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java @@ -1272,7 +1272,8 @@ public class GridQueryProcessor extends GridProcessorAdapter { private void registerCache0(String space, GridCacheContext cctx, Collection cands) throws IgniteCheckedException { synchronized (stateMux) { - idx.registerCache(space, cctx, cctx.config()); + if (idx != null) + idx.registerCache(space, cctx, cctx.config()); try { for (QueryTypeCandidate cand : cands) { @@ -1301,7 +1302,8 @@ public class GridQueryProcessor extends GridProcessorAdapter { } } - idx.registerType(space, desc); + if (idx != null) + idx.registerType(space, desc); } spaces.add(CU.mask(space));