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 B92CA172F4 for ; Tue, 3 Feb 2015 06:36:36 +0000 (UTC) Received: (qmail 15964 invoked by uid 500); 3 Feb 2015 06:36:37 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 15930 invoked by uid 500); 3 Feb 2015 06:36:37 -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 15921 invoked by uid 99); 3 Feb 2015 06:36:37 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Feb 2015 06:36:37 +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; Tue, 03 Feb 2015 06:36:15 +0000 Received: (qmail 15227 invoked by uid 99); 3 Feb 2015 06:36:12 -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; Tue, 03 Feb 2015 06:36:12 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6747FE05DD; Tue, 3 Feb 2015 06:36:12 +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: Tue, 03 Feb 2015 06:36:14 -0000 Message-Id: <36daa8c513724a239d6fe439008cc693@git.apache.org> In-Reply-To: <33e0547e09ad49cea2fb40613f556618@git.apache.org> References: <33e0547e09ad49cea2fb40613f556618@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [03/30] incubator-ignite git commit: ignite-86 review X-Virus-Checked: Checked by ClamAV on apache.org ignite-86 review Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c7db90e6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c7db90e6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c7db90e6 Branch: refs/heads/ignite-151-154 Commit: c7db90e636a1a2c6c8258aa9d9397d6277a641f0 Parents: 173726f Author: Yakov Zhdanov Authored: Wed Jan 21 20:47:33 2015 +0300 Committer: Yakov Zhdanov Committed: Wed Jan 21 20:47:33 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheDeploymentManager.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c7db90e6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheDeploymentManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheDeploymentManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheDeploymentManager.java index 58fe292..17a116e 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheDeploymentManager.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheDeploymentManager.java @@ -212,7 +212,7 @@ public class GridCacheDeploymentManager extends GridCacheSharedManagerAdap for (GridCacheContext cacheCtx : cctx.cacheContexts()) { // Unwind immediately for local and replicate caches. // We go through preloader for proper synchronization. - if (cacheCtx.isLocal() || cacheCtx.isReplicated()) + if (cacheCtx.isLocal()) cacheCtx.preloader().unwindUndeploys(); } } @@ -275,7 +275,7 @@ public class GridCacheDeploymentManager extends GridCacheSharedManagerAdap } })); - Collection keys = new LinkedList<>(); + Collection keys = new ArrayList<>(); for (K k : keySet) keys.add(k); @@ -298,19 +298,20 @@ public class GridCacheDeploymentManager extends GridCacheSharedManagerAdap cacheCtx.near().dht().context().swap().onUndeploy(leftNodeId, ldr) : cacheCtx.swap().onUndeploy(leftNodeId, ldr); - if (keys.size() == 0 || cacheCtx.system()) + if (cacheCtx.system()) continue; U.quietAndWarn(log, ""); U.quietAndWarn( log, - "Cleared all cache entries for undeployed class loader [[cacheName=" + cacheCtx.namexx() + + "Cleared all cache entries for undeployed class loader [cacheName=" + cacheCtx.namexx() + ", undeployCnt=" + keys.size() + ", swapUndeployCnt=" + swapUndeployCnt + ", clsLdr=" + ldr.getClass().getName() + ']', "Cleared all cache entries for undeployed class loader for cache: " + cacheCtx.namexx()); U.quietAndWarn( log, - " ^-- Cache auto-undeployment happens in SHARED deployment mode (to turn off, switch to CONTINUOUS mode)"); + " ^-- Cache auto-undeployment happens in SHARED deployment mode " + + "(to turn off, switch to CONTINUOUS mode)"); U.quietAndWarn(log, ""); }