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-648 Commit: 389bad8d1cac892b01c0a5e5e9479337410c1109 Parents: fe92bfe Author: Valentin Kulichenko <vkuliche...@gridgain.com> Authored: Wed Jun 24 18:47:42 2015 -0700 Committer: Valentin Kulichenko <vkuliche...@gridgain.com> 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); }
