Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 0346F200B57 for ; Sat, 25 Jun 2016 02:21:42 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 02059160A5A; Sat, 25 Jun 2016 00:21:42 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 3CF5B160A62 for ; Sat, 25 Jun 2016 02:21:41 +0200 (CEST) Received: (qmail 14822 invoked by uid 500); 25 Jun 2016 00:21:40 -0000 Mailing-List: contact commits-help@geode.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@geode.incubator.apache.org Delivered-To: mailing list commits@geode.incubator.apache.org Received: (qmail 14741 invoked by uid 99); 25 Jun 2016 00:21:40 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 25 Jun 2016 00:21:40 +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 DE4631A062A for ; Sat, 25 Jun 2016 00:21:39 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -4.646 X-Spam-Level: X-Spam-Status: No, score=-4.646 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-1.426] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id ai5010Et0f4t for ; Sat, 25 Jun 2016 00:21:38 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id 170E05FACD for ; Sat, 25 Jun 2016 00:21:36 +0000 (UTC) Received: (qmail 14612 invoked by uid 99); 25 Jun 2016 00:21:36 -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; Sat, 25 Jun 2016 00:21:36 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0FD88E943A; Sat, 25 Jun 2016 00:21:36 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dschneider@apache.org To: commits@geode.incubator.apache.org Date: Sat, 25 Jun 2016 00:21:41 -0000 Message-Id: <5803ceacbda54cb192c4b7b9573679fe@git.apache.org> In-Reply-To: <6595a605f41746b989a8d15b9193de9d@git.apache.org> References: <6595a605f41746b989a8d15b9193de9d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [7/8] incubator-geode git commit: TombstoneService is no longer a ResourceListener archived-at: Sat, 25 Jun 2016 00:21:42 -0000 TombstoneService is no longer a ResourceListener Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/8f367182 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/8f367182 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/8f367182 Branch: refs/heads/feature/GEODE-1420 Commit: 8f36718211e6cca80637ce6ce0286f4e8ab3442a Parents: 4a74ddf Author: Darrel Schneider Authored: Fri Jun 24 16:13:50 2016 -0700 Committer: Darrel Schneider Committed: Fri Jun 24 16:13:50 2016 -0700 ---------------------------------------------------------------------- .../gemfire/internal/cache/TombstoneService.java | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8f367182/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 cdf1e1b..6989ed2 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 @@ -20,8 +20,6 @@ import com.gemstone.gemfire.CancelException; import com.gemstone.gemfire.SystemFailure; import com.gemstone.gemfire.cache.util.ObjectSizer; import com.gemstone.gemfire.distributed.internal.DistributionConfig; -import com.gemstone.gemfire.internal.cache.control.MemoryEvent; -import com.gemstone.gemfire.internal.cache.control.ResourceListener; import com.gemstone.gemfire.internal.cache.versions.CompactVersionHolder; import com.gemstone.gemfire.internal.cache.versions.VersionSource; import com.gemstone.gemfire.internal.cache.versions.VersionTag; @@ -50,7 +48,7 @@ import java.util.concurrent.atomic.AtomicLong; * and timing out tombstones. * */ -public class TombstoneService implements ResourceListener { +public class TombstoneService { private static final Logger logger = LogService.getLogger(); /** @@ -949,18 +947,4 @@ public class TombstoneService implements ResourceListener { currentTombstone = null; } } // class TombstoneSweeper - - /* (non-Javadoc) - * @see com.gemstone.gemfire.internal.cache.control.ResourceListener#onEvent(java.lang.Object) - */ - @Override - public void onEvent(MemoryEvent event) { - if (event.isLocal()) { - if (event.getState().isEviction() && !event.getPreviousState().isEviction()) { - this.replicatedTombstoneSweeper.forceBatchExpiration(); - } - } - } - - }