Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 77D3517567 for ; Thu, 9 Apr 2015 16:52:02 +0000 (UTC) Received: (qmail 68717 invoked by uid 500); 9 Apr 2015 16:51:53 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 68687 invoked by uid 500); 9 Apr 2015 16:51:53 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 68658 invoked by uid 99); 9 Apr 2015 16:51:52 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 09 Apr 2015 16:51:52 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Thu, 09 Apr 2015 16:51:50 +0000 Received: (qmail 67669 invoked by uid 99); 9 Apr 2015 16:51:30 -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, 09 Apr 2015 16:51:30 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E52DFE0013; Thu, 9 Apr 2015 16:51:29 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.incubator.apache.org Date: Thu, 09 Apr 2015 16:51:41 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [13/50] [abbrv] incubator-ignite git commit: #ignite-180: Fix NullPointerException in DataStructuresProcessor. X-Virus-Checked: Checked by ClamAV on apache.org #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-537 Commit: 8f6e7a624306cbf184f7879c8f0169a3755ed1e4 Parents: 079186a Author: ivasilinets Authored: Tue Apr 7 13:45:01 2015 +0300 Committer: ivasilinets 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 infos) { + if (infos == null) + return null; + for (CacheCollectionInfo col : infos) { if (col.cfg.getAtomicityMode() == cfg.getAtomicityMode() && col.cfg.getMemoryMode() == cfg.getMemoryMode() &&