Repository: geode Updated Branches: refs/heads/develop 21373946c -> e667e82d0
Revert "GEODE-2240: fix unsafe concurrent access of ArrayList" Reverting this commit as it seems to cause a deadlock. This reverts commit 815d909e980e54da485370aa665c426e4ea9ac45. Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/e667e82d Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/e667e82d Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/e667e82d Branch: refs/heads/develop Commit: e667e82d01bf90e3becb3ca3e0a7ce54d3f9e659 Parents: 2137394 Author: Anthony Baker <[email protected]> Authored: Wed Dec 28 15:34:20 2016 -0800 Committer: Anthony Baker <[email protected]> Committed: Wed Dec 28 15:48:06 2016 -0800 ---------------------------------------------------------------------- .../java/org/apache/geode/internal/cache/TombstoneService.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode/blob/e667e82d/geode-core/src/main/java/org/apache/geode/internal/cache/TombstoneService.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TombstoneService.java b/geode-core/src/main/java/org/apache/geode/internal/cache/TombstoneService.java index 7032775..2840134 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/TombstoneService.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TombstoneService.java @@ -669,9 +669,7 @@ public class TombstoneService { if (logger.isTraceEnabled(LogMarker.TOMBSTONE)) { logger.trace(LogMarker.TOMBSTONE, "adding expired tombstone {} to batch", tombstone); } - synchronized (getBlockGCLock()) { - expiredTombstones.add(tombstone); - } + expiredTombstones.add(tombstone); } @Override
