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 A6181200C21 for ; Sun, 5 Feb 2017 20:45:05 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id A2D14160B48; Sun, 5 Feb 2017 19:45: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 F319C160B59 for ; Sun, 5 Feb 2017 20:45:04 +0100 (CET) Received: (qmail 43098 invoked by uid 500); 5 Feb 2017 19:45:04 -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 42982 invoked by uid 99); 5 Feb 2017 19:45: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; Sun, 05 Feb 2017 19:45:03 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B3832E00EE; Sun, 5 Feb 2017 19:45:03 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sergi@apache.org To: commits@ignite.apache.org Date: Sun, 05 Feb 2017 19:45:05 -0000 Message-Id: <196aa9c3404549b2b45d7321c0438987@git.apache.org> In-Reply-To: <79386dc8ef5b44608ed5d9e8769710b0@git.apache.org> References: <79386dc8ef5b44608ed5d9e8769710b0@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/9] ignite git commit: ignite-db-x compile err fix resetLostPartitions archived-at: Sun, 05 Feb 2017 19:45:05 -0000 ignite-db-x compile err fix resetLostPartitions Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8a6736e6 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8a6736e6 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8a6736e6 Branch: refs/heads/ignite-4652 Commit: 8a6736e64dd42917cf385e45043e536e53841278 Parents: a70dc00 Author: Dmitriy Govorukhin Authored: Fri Feb 3 13:53:13 2017 +0300 Committer: Dmitriy Govorukhin Committed: Fri Feb 3 13:53:13 2017 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/cache/GridCacheProcessor.java | 2 +- .../src/main/java/org/apache/ignite/IgniteSpringBean.java | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/8a6736e6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java index 542a18c..987d696 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java @@ -2582,7 +2582,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { Collection reqs = new ArrayList<>(cacheNames.size()); for (String cacheName : cacheNames) { - DynamicCacheDescriptor desc = registeredCaches.get(cacheName); + DynamicCacheDescriptor desc = registeredCaches.get(maskNull(cacheName)); if (desc == null) { log.warning("Reset lost partition will not be executed, " + http://git-wip-us.apache.org/repos/asf/ignite/blob/8a6736e6/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java b/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java index c5c1ad1..fc45a25 100644 --- a/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java +++ b/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java @@ -265,6 +265,13 @@ public class IgniteSpringBean implements Ignite, DisposableBean, InitializingBea } /** {@inheritDoc} */ + @Override public void resetLostPartitions(Collection cacheNames) { + checkIgnite(); + + g.resetLostPartitions(cacheNames); + } + + /** {@inheritDoc} */ @Override public IgniteCache cache(@Nullable String name) { checkIgnite();