GEODE-3305 testEventProcessingMixedSiteOneCurrentSiteTwo[1] FAILED Reinstated cleaning up of TcpClient locator version information in tearDownVM. This was lost when DistributedTestCase was emptied and its contents poured into JUnit4DistributedTestCase.
Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/cea8312b Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/cea8312b Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/cea8312b Branch: refs/heads/feature/GEODE-3299 Commit: cea8312b02b7942b6a2da5ccca501c3ea8feb517 Parents: 37d388b Author: Bruce Schuchardt <bschucha...@pivotal.io> Authored: Wed Aug 2 15:39:51 2017 -0700 Committer: Bruce Schuchardt <bschucha...@pivotal.io> Committed: Wed Aug 2 15:42:03 2017 -0700 ---------------------------------------------------------------------- .../geode/test/dunit/internal/JUnit4DistributedTestCase.java | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode/blob/cea8312b/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 9f13dfb..3572e3f 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 @@ -47,6 +47,7 @@ import org.apache.geode.distributed.DistributedSystem; 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.distributed.internal.tcpserver.TcpClient; import org.apache.geode.internal.admin.ClientStatsManager; import org.apache.geode.internal.cache.CacheServerLauncher; import org.apache.geode.internal.cache.DiskStoreObserver; @@ -601,6 +602,7 @@ public abstract class JUnit4DistributedTestCase implements DistributedTestFixtur RegionTestCase.preSnapshotRegion = null; SocketCreator.resetHostNameCache(); SocketCreator.resolve_dns = true; + TcpClient.clearStaticData(); // clear system properties -- keep alphabetized System.clearProperty(DistributionConfig.GEMFIRE_PREFIX + "log-level");