You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2016/03/16 22:40:17 UTC
incubator-geode git commit: Disconnect all from DS if
getDistributedSystemProperties contains entries
Repository: incubator-geode
Updated Branches:
refs/heads/feature/GEODE-1050 1b60b46f7 -> dd3e6c0f8
Disconnect all from DS if getDistributedSystemProperties contains entries
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/dd3e6c0f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/dd3e6c0f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/dd3e6c0f
Branch: refs/heads/feature/GEODE-1050
Commit: dd3e6c0f8639a98ee0e3c266ff4b30049c55d9ce
Parents: 1b60b46
Author: Kirk Lund <kl...@apache.org>
Authored: Wed Mar 16 14:39:49 2016 -0700
Committer: Kirk Lund <kl...@apache.org>
Committed: Wed Mar 16 14:39:49 2016 -0700
----------------------------------------------------------------------
.../gemfire/test/dunit/internal/JUnit4DistributedTestCase.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/dd3e6c0f/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/internal/JUnit4DistributedTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/internal/JUnit4DistributedTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/internal/JUnit4DistributedTestCase.java
index 1a1309b..921e325 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/internal/JUnit4DistributedTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/internal/JUnit4DistributedTestCase.java
@@ -481,10 +481,12 @@ public class JUnit4DistributedTestCase implements DistributedTestFixture, Serial
private final void tearDownDistributedTestCase() throws Exception {
Invoke.invokeInEveryVM(()->tearDownCreationStackGenerator());
if (logPerTest) {
- disconnectFromDS();
- Invoke.invokeInEveryVM(()->disconnectFromDS());
+ disconnectAllFromDS();
}
cleanupAllVms();
+ if (!getDistributedSystemProperties().isEmpty()) {
+ disconnectAllFromDS();
+ }
}
/**