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 E7D6C177E6 for ; Fri, 10 Jul 2015 10:47:02 +0000 (UTC) Received: (qmail 46470 invoked by uid 500); 10 Jul 2015 10:47:02 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 46440 invoked by uid 500); 10 Jul 2015 10:47:02 -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 46431 invoked by uid 99); 10 Jul 2015 10:47:02 -0000 Received: from Unknown (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 10 Jul 2015 10:47:02 +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 619841A6CDD for ; Fri, 10 Jul 2015 10:47:02 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.791 X-Spam-Level: * X-Spam-Status: No, score=1.791 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] 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 cR_l5tgOM9KO for ; Fri, 10 Jul 2015 10:46:53 +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 05727211A9 for ; Fri, 10 Jul 2015 10:46:53 +0000 (UTC) Received: (qmail 46254 invoked by uid 99); 10 Jul 2015 10:46:52 -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, 10 Jul 2015 10:46:52 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6DB5AE3667; Fri, 10 Jul 2015 10:46:52 +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: Fri, 10 Jul 2015 10:46:53 -0000 Message-Id: In-Reply-To: <25eef573190e411489510a566d2abc7f@git.apache.org> References: <25eef573190e411489510a566d2abc7f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [02/50] [abbrv] incubator-ignite git commit: IGNITE-1026 - Count down latch fix IGNITE-1026 - Count down latch fix Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/389bad8d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/389bad8d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/389bad8d Branch: refs/heads/ignite-1056 Commit: 389bad8d1cac892b01c0a5e5e9479337410c1109 Parents: fe92bfe Author: Valentin Kulichenko Authored: Wed Jun 24 18:47:42 2015 -0700 Committer: Valentin Kulichenko Committed: Wed Jun 24 18:47:42 2015 -0700 ---------------------------------------------------------------------- .../processors/datastructures/DataStructuresProcessor.java | 9 --------- .../datastructures/GridCacheCountDownLatchImpl.java | 3 --- 2 files changed, 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/389bad8d/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java index c26e14d..4d2ecbe 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java @@ -29,7 +29,6 @@ import org.apache.ignite.internal.transactions.*; import org.apache.ignite.internal.util.lang.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.lang.*; import org.jetbrains.annotations.*; import org.jsr166.*; @@ -1158,14 +1157,6 @@ public final class DataStructuresProcessor extends GridProcessorAdapter { latch0.onUpdate(val.get()); if (val.get() == 0 && val.autoDelete()) { - try { - removeCountDownLatch(latch0.name()); - } - catch (IgniteCheckedException e) { - U.error(log, "Failed to automatically delete count down latch: " + - latch0.name(), e); - } - dsMap.remove(key); latch.onRemoved(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/389bad8d/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheCountDownLatchImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheCountDownLatchImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheCountDownLatchImpl.java index 33547d9..a5353d8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheCountDownLatchImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheCountDownLatchImpl.java @@ -288,9 +288,6 @@ public final class GridCacheCountDownLatchImpl implements GridCacheCountDownLatc /** {@inheritDoc} */ @Override public void close() { - if (rmvd) - return; - try { ctx.kernalContext().dataStructures().removeCountDownLatch(name); }