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/feature/GEODE-2485 Commit: 799548ee4e4d883309f83bf401d6af892b3abfc1 Parents: 19376d3 Author: Bruce Schuchardt <bschucha...@pivotal.io> Authored: Thu Apr 6 15:46:31 2017 -0700 Committer: Bruce Schuchardt <bschucha...@pivotal.io> 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;
