Return-Path: X-Original-To: apmail-geode-commits-archive@minotaur.apache.org Delivered-To: apmail-geode-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 94EFC1880B for ; Tue, 3 Nov 2015 11:26:17 +0000 (UTC) Received: (qmail 68668 invoked by uid 500); 3 Nov 2015 11:26:17 -0000 Delivered-To: apmail-geode-commits-archive@geode.apache.org Received: (qmail 68638 invoked by uid 500); 3 Nov 2015 11:26:17 -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 68629 invoked by uid 99); 3 Nov 2015 11:26:17 -0000 Received: from Unknown (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Nov 2015 11:26:17 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id E8E90C094C for ; Tue, 3 Nov 2015 11:26:16 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.771 X-Spam-Level: * X-Spam-Status: No, score=1.771 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, 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 (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id Kyf2uh_lP02V for ; Tue, 3 Nov 2015 11:26:15 +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 89E6C238C1 for ; Tue, 3 Nov 2015 11:25:25 +0000 (UTC) Received: (qmail 62088 invoked by uid 99); 3 Nov 2015 11:25:25 -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; Tue, 03 Nov 2015 11:25:25 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6E0B0E00C5; Tue, 3 Nov 2015 11:25:25 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tushark@apache.org To: commits@geode.incubator.apache.org Date: Tue, 03 Nov 2015 11:26:33 -0000 Message-Id: <1f808c7b3d184c0e93042d246808d038@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [71/79] incubator-geode git commit: GEODE-307: Clear DiskStoreObserver after each test GEODE-307: Clear DiskStoreObserver after each test An observer was being left over and causing later tests to fail. Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/8f92f8e9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/8f92f8e9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/8f92f8e9 Branch: refs/heads/feature/GEODE-17 Commit: 8f92f8e9923aa2cc8c26774a66603f792e4f9328 Parents: 8ff01ba Author: Dan Smith Authored: Wed Sep 2 15:23:11 2015 -0700 Committer: tushark Committed: Tue Nov 3 16:52:44 2015 +0530 ---------------------------------------------------------------------- gemfire-core/src/test/java/dunit/DistributedTestCase.java | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8f92f8e9/gemfire-core/src/test/java/dunit/DistributedTestCase.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/dunit/DistributedTestCase.java b/gemfire-core/src/test/java/dunit/DistributedTestCase.java index 8aa8b6d..2e7ac03 100755 --- a/gemfire-core/src/test/java/dunit/DistributedTestCase.java +++ b/gemfire-core/src/test/java/dunit/DistributedTestCase.java @@ -52,6 +52,7 @@ import com.gemstone.gemfire.internal.InternalInstantiator; import com.gemstone.gemfire.internal.OSProcess; import com.gemstone.gemfire.internal.SocketCreator; import com.gemstone.gemfire.internal.admin.ClientStatsManager; +import com.gemstone.gemfire.internal.cache.DiskStoreObserver; import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; import com.gemstone.gemfire.internal.cache.InitialImageOperation; import com.gemstone.gemfire.internal.cache.LocalRegion; @@ -784,6 +785,7 @@ public abstract class DistributedTestCase extends TestCase implements java.io.Se Protocol.trace = GemFireTracer.DEBUG; DistributionMessageObserver.setInstance(null); QueryObserverHolder.reset(); + DiskStoreObserver.setInstance(null); if (InternalDistributedSystem.systemAttemptingReconnect != null) { InternalDistributedSystem.systemAttemptingReconnect.stopReconnecting(); }