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 373AE184D9 for ; Fri, 3 Jul 2015 14:56:58 +0000 (UTC) Received: (qmail 8062 invoked by uid 500); 3 Jul 2015 14:56:58 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 8033 invoked by uid 500); 3 Jul 2015 14:56:58 -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 8023 invoked by uid 99); 3 Jul 2015 14:56:58 -0000 Received: from Unknown (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 03 Jul 2015 14:56:58 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 878EC1A6645 for ; Fri, 3 Jul 2015 14:56:57 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.79 X-Spam-Level: X-Spam-Status: No, score=0.79 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, T_RP_MATCHES_RCVD=-0.01] autolearn=disabled Received: from mx1-us-west.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id G0xFp5MP9ZMv for ; Fri, 3 Jul 2015 14:56:42 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with SMTP id 0904022F2D for ; Fri, 3 Jul 2015 14:56:42 +0000 (UTC) Received: (qmail 6779 invoked by uid 99); 3 Jul 2015 14:56:41 -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, 03 Jul 2015 14:56:41 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A2E6FE33C9; Fri, 3 Jul 2015 14:56:41 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: av@apache.org To: commits@ignite.incubator.apache.org Date: Fri, 03 Jul 2015 14:56:44 -0000 Message-Id: <04edd937112e4ae198f631a6827a1b24@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [04/50] incubator-ignite git commit: # suppress undeployed message if nothing has # suppress undeployed message if nothing has Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6929a0cb Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6929a0cb Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6929a0cb Branch: refs/heads/ignite-929 Commit: 6929a0cbb382d4b924f127ed65b9fbbe4b232780 Parents: 1d5cfbc Author: Yakov Zhdanov Authored: Mon Jun 29 11:08:37 2015 -0700 Committer: Yakov Zhdanov Committed: Mon Jun 29 11:08:37 2015 -0700 ---------------------------------------------------------------------- .../processors/cache/GridCacheDeploymentManager.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6929a0cb/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentManager.java index ff109ed..677377e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentManager.java @@ -255,17 +255,17 @@ public class GridCacheDeploymentManager extends GridCacheSharedManagerAdap cacheCtx.near().dht().context().swap().onUndeploy(ldr) : cacheCtx.swap().onUndeploy(ldr); - if (cacheCtx.userCache()) { + if (cacheCtx.userCache() && (!keys.isEmpty() || swapUndeployCnt != 0)) { 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()); + ", clsLdr=" + ldr.getClass().getName() + ']'); 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, ""); }