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 D400917794 for ; Mon, 2 Feb 2015 14:53:05 +0000 (UTC) Received: (qmail 24163 invoked by uid 500); 2 Feb 2015 14:53:06 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 24119 invoked by uid 500); 2 Feb 2015 14:53:06 -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 24097 invoked by uid 99); 2 Feb 2015 14:53:06 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Feb 2015 14:53:06 +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; Mon, 02 Feb 2015 14:53:04 +0000 Received: (qmail 23650 invoked by uid 99); 2 Feb 2015 14:52:44 -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; Mon, 02 Feb 2015 14:52:44 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5DE9FE0542; Mon, 2 Feb 2015 14:52:44 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: akuznetsov@apache.org To: commits@ignite.incubator.apache.org Date: Mon, 02 Feb 2015 14:52:58 -0000 Message-Id: <8f7d3a8b64d24da0b296832a3dba8225@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [15/31] incubator-ignite git commit: #IGNITE-86: Change using cache context to ctx.namexx() as a key for map. X-Virus-Checked: Checked by ClamAV on apache.org #IGNITE-86: Change using cache context to ctx.namexx() as a key for map. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/20424760 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/20424760 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/20424760 Branch: refs/heads/ignite-32 Commit: 20424760d6827a26399080d72a0fbf0a9c1239b9 Parents: 09b09b7 Author: ivasilinets Authored: Mon Jan 26 13:01:09 2015 +0300 Committer: ivasilinets Committed: Mon Jan 26 13:01:09 2015 +0300 ---------------------------------------------------------------------- .../internal/processors/cache/GridCacheDeploymentManager.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/20424760/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 2df866d..8729b86 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 @@ -182,7 +182,7 @@ public class GridCacheDeploymentManager extends GridCacheSharedManagerAdap public void unwind(GridCacheContext ctx) { int cnt = 0; - ConcurrentLinkedQueue q = undeploys.get(ctx); + ConcurrentLinkedQueue q = undeploys.get(ctx.namexx()); if (q == null) return; @@ -209,9 +209,9 @@ public class GridCacheDeploymentManager extends GridCacheSharedManagerAdap log.debug("Received onUndeploy() request [ldr=" + ldr + ", cctx=" + cctx + ']'); for (final GridCacheContext cacheCtx : cctx.cacheContexts()) { - undeploys.putIfAbsent(cacheCtx.namexx(), new ConcurrentLinkedQueue()); // TODO + undeploys.putIfAbsent(cacheCtx.namexx(), new ConcurrentLinkedQueue()); - undeploys.get(cacheCtx).add(new CA() { + undeploys.get(cacheCtx.namexx()).add(new CA() { @Override public void apply() { onUndeploy0(ldr, cacheCtx);