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 7198317660 for ; Mon, 2 Feb 2015 14:17:15 +0000 (UTC) Received: (qmail 36124 invoked by uid 500); 2 Feb 2015 14:17:16 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 36045 invoked by uid 500); 2 Feb 2015 14:17:16 -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 36031 invoked by uid 99); 2 Feb 2015 14:17:16 -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:17:16 +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:17:14 +0000 Received: (qmail 35690 invoked by uid 99); 2 Feb 2015 14:16:53 -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:16:53 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7C2F8E0540; Mon, 2 Feb 2015 14:16:53 +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: Mon, 02 Feb 2015 14:17:05 -0000 Message-Id: <953d19340e064b58982d8753f948e937@git.apache.org> In-Reply-To: <590bcc955adc4e118c8c8988a982560b@git.apache.org> References: <590bcc955adc4e118c8c8988a982560b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [13/43] 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/cb767aaa Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cb767aaa Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cb767aaa Branch: refs/heads/ignite-26 Commit: cb767aaadc36d1efbeff5605f85c6668128c3b70 Parents: 7cccef7 Author: Yakov Zhdanov Authored: Fri Jan 23 20:08:36 2015 +0300 Committer: Yakov Zhdanov Committed: Fri Jan 23 20:08:36 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheDeploymentManager.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cb767aaa/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 2f007f2..2df866d 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 @@ -53,12 +53,10 @@ public class GridCacheDeploymentManager extends GridCacheSharedManagerAdap private volatile ClassLoader globalLdr; /** Undeploys. */ - private final ConcurrentHashMap8> undeploys - = new ConcurrentHashMap8<>(); + private final ConcurrentMap> undeploys = new ConcurrentHashMap8<>(); /** Per-thread deployment context. */ - private ConcurrentMap> deps = - new ConcurrentHashMap8<>(); + private ConcurrentMap> deps = new ConcurrentHashMap8<>(); /** Collection of all known participants (Node ID -> Loader ID). */ private Map allParticipants = new ConcurrentHashMap8<>(); @@ -184,10 +182,12 @@ public class GridCacheDeploymentManager extends GridCacheSharedManagerAdap public void unwind(GridCacheContext ctx) { int cnt = 0; - if (undeploys.get(ctx) == null) + ConcurrentLinkedQueue q = undeploys.get(ctx); + + if (q == null) return; - for (CA c = undeploys.get(ctx).poll(); c != null; c = undeploys.get(ctx).poll()) { + for (CA c = q.poll(); c != null; c = q.poll()) { c.apply(); cnt++; @@ -209,7 +209,7 @@ public class GridCacheDeploymentManager extends GridCacheSharedManagerAdap log.debug("Received onUndeploy() request [ldr=" + ldr + ", cctx=" + cctx + ']'); for (final GridCacheContext cacheCtx : cctx.cacheContexts()) { - undeploys.putIfAbsent(cacheCtx, new ConcurrentLinkedQueue()); + undeploys.putIfAbsent(cacheCtx.namexx(), new ConcurrentLinkedQueue()); // TODO undeploys.get(cacheCtx).add(new CA() { @Override