Spring/spring-data-gemfire
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SGF-644 - Adapt to API and scoping/visibility changes in org.apache.geode.distributed.internal.SharedConfiguration class.

Browse Source
This commit is contained in:
John Blum
2017-07-19 14:38:52 -07:00
parent c1fb8bb28d
commit c7c593489e
1 changed files with 7 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/test/java/org/springframework/data/gemfire/fork/LocatorProcess.java
View File

@@ -25,7 +25,6 @@ import org.apache.geode.distributed.Locator;
import org.apache.geode.distributed.LocatorLauncher;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.distributed.internal.InternalLocator;
import org.apache.geode.distributed.internal.SharedConfiguration;
import org.springframework.data.gemfire.GemfireUtils;
import org.springframework.data.gemfire.process.support.ProcessUtils;
import org.springframework.data.gemfire.test.support.FileSystemUtils;
@@ -141,32 +140,12 @@ public class LocatorProcess {
Locator locator = GemfireUtils.getLocator();
if (locator != null) {
stopClusterConfigurationService(locator).stop();
locator.stop();
}
}));
}
private static boolean isClusterConfigurationEnabled(Locator locator) {
return (locator instanceof InternalLocator && Boolean.valueOf(
locator.getDistributedSystem().getProperties().getProperty(
DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME)));
}
private static Locator stopClusterConfigurationService(Locator locator) {
if (isClusterConfigurationEnabled(locator)) {
SharedConfiguration sharedConfiguration = ((InternalLocator) locator).getSharedConfiguration();
if (sharedConfiguration != null) {
if (Boolean.valueOf(getProperty("spring.data.gemfire.fork.clean", Boolean.TRUE.toString()))) {
sharedConfiguration.destroySharedConfiguration();
}
}
}
return locator;
}
private static void waitForLocatorStart(long milliseconds) {
private static void waitForLocatorStart(final long milliseconds) {
InternalLocator locator = InternalLocator.getLocator();
if (isClusterConfigurationEnabled(locator)) {
@@ -177,4 +156,9 @@ public class LocatorProcess {
milliseconds, Math.min(500L, milliseconds), TimeUnit.MILLISECONDS);
}
}
private static boolean isClusterConfigurationEnabled(final InternalLocator locator) {
return (locator != null && Boolean.valueOf(locator.getDistributedSystem().getProperties().getProperty(
DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME)));
}
}