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 9EA1D200C4E for ; Fri, 7 Apr 2017 00:48:35 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 9AA87160B9F; Thu, 6 Apr 2017 22:48:35 +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 DF66C160B91 for ; Fri, 7 Apr 2017 00:48:34 +0200 (CEST) Received: (qmail 74859 invoked by uid 500); 6 Apr 2017 22:48:34 -0000 Mailing-List: contact commits-help@geode.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@geode.apache.org Delivered-To: mailing list commits@geode.apache.org Received: (qmail 74850 invoked by uid 99); 6 Apr 2017 22:48:34 -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; Thu, 06 Apr 2017 22:48:34 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 03222F2192; Thu, 6 Apr 2017 22:48:34 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bschuchardt@apache.org To: commits@geode.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: geode git commit: GEODE-2732 after auto-reconnect a server is restarted on the default port Date: Thu, 6 Apr 2017 22:48:34 +0000 (UTC) archived-at: Thu, 06 Apr 2017 22:48:35 -0000 Repository: geode Updated Branches: refs/heads/develop 19376d306 -> 799548ee4 GEODE-2732 after auto-reconnect a server is restarted on the default port Now that gfsh cache server parameters are no longer held in a ThreadLocal we need to clear the static variables holding the parameters in order to avoid having one test affect another. Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/799548ee Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/799548ee Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/799548ee Branch: refs/heads/develop Commit: 799548ee4e4d883309f83bf401d6af892b3abfc1 Parents: 19376d3 Author: Bruce Schuchardt Authored: Thu Apr 6 15:46:31 2017 -0700 Committer: Bruce Schuchardt Committed: Thu Apr 6 15:48:21 2017 -0700 ---------------------------------------------------------------------- .../geode/test/dunit/internal/JUnit4DistributedTestCase.java | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode/blob/799548ee/geode-core/src/test/java/org/apache/geode/test/dunit/internal/JUnit4DistributedTestCase.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/internal/JUnit4DistributedTestCase.java b/geode-core/src/test/java/org/apache/geode/test/dunit/internal/JUnit4DistributedTestCase.java index 19949c2..5a679bb 100644 --- a/geode-core/src/test/java/org/apache/geode/test/dunit/internal/JUnit4DistributedTestCase.java +++ b/geode-core/src/test/java/org/apache/geode/test/dunit/internal/JUnit4DistributedTestCase.java @@ -34,6 +34,7 @@ import org.apache.geode.distributed.internal.DistributionConfig; import org.apache.geode.distributed.internal.DistributionMessageObserver; import org.apache.geode.distributed.internal.InternalDistributedSystem; import org.apache.geode.internal.admin.ClientStatsManager; +import org.apache.geode.internal.cache.CacheServerLauncher; import org.apache.geode.internal.cache.DiskStoreObserver; import org.apache.geode.internal.cache.GemFireCacheImpl; import org.apache.geode.internal.cache.HARegion; @@ -581,6 +582,7 @@ public abstract class JUnit4DistributedTestCase implements DistributedTestFixtur disconnectFromDS(); // keep alphabetized to detect duplicate lines CacheCreation.clearThreadLocals(); + CacheServerLauncher.clearStatics(); CacheServerTestUtil.clearCacheReference(); ClientProxyMembershipID.system = null; ClientServerTestCase.AUTO_LOAD_BALANCE = false;