GEODE-1420: fix 100ms delay in stopping tombstone sweeper
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/54f305be Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/54f305be Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/54f305be Branch: refs/heads/master Commit: 54f305be774312bed7125fe6b0abcf19f6f2c11a Parents: 3e6eb4c Author: Darrel Schneider <[email protected]> Authored: Wed Jul 20 16:39:00 2016 -0700 Committer: Darrel Schneider <[email protected]> Committed: Thu Jul 21 10:41:40 2016 -0700 ---------------------------------------------------------------------- .../com/gemstone/gemfire/internal/cache/TombstoneService.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/54f305be/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TombstoneService.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TombstoneService.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TombstoneService.java index 192e24d..2241b33 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TombstoneService.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TombstoneService.java @@ -787,9 +787,9 @@ public class TombstoneService { this.sweeperThread.start(); } - synchronized void stop() { - this.isStopped = true; - if (this.sweeperThread != null) { + void stop() { + synchronized (this) { + this.isStopped = true; notifyAll(); } try { @@ -797,7 +797,6 @@ public class TombstoneService { } catch (InterruptedException e) { Thread.currentThread().interrupt(); } - getQueue().clear(); } private void lockQueueHead() {
