You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by hi...@apache.org on 2016/05/19 19:27:18 UTC
[13/36] incubator-geode git commit: GEODE-1370: restore name of
destroySharedConfiguration_forTestsOnly
GEODE-1370: restore name of destroySharedConfiguration_forTestsOnly
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/9d28009f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/9d28009f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/9d28009f
Branch: refs/heads/feature/GEODE-1372
Commit: 9d28009f1018bba74dab671c64ee42e8b4a25899
Parents: fe69f0a
Author: Kirk Lund <kl...@apache.org>
Authored: Wed May 11 09:56:07 2016 -0700
Committer: Kirk Lund <kl...@apache.org>
Committed: Wed May 11 09:56:07 2016 -0700
----------------------------------------------------------------------
.../gemfire/distributed/internal/SharedConfiguration.java | 2 +-
.../internal/configuration/SharedConfigurationDUnitTest.java | 2 +-
.../internal/configuration/SharedConfigurationTestUtils.java | 2 +-
.../configuration/SharedConfigurationUsingDirDUnitTest.java | 3 +--
4 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9d28009f/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/SharedConfiguration.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/SharedConfiguration.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/SharedConfiguration.java
index 0f349e9..ba9c7dc 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/SharedConfiguration.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/SharedConfiguration.java
@@ -406,7 +406,7 @@ public class SharedConfiguration {
* <p/>
* Throws {@code AssertionError} wrapping any exception thrown by operation.
*/
- public void destroySharedConfiguration_forTestsOnly() {
+ public void destroySharedConfiguration() {
try {
Region<String, Configuration> configRegion = getConfigurationRegion();
if (configRegion != null) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9d28009f/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationDUnitTest.java
index c07eab7..f0c685b 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationDUnitTest.java
@@ -187,7 +187,7 @@ public class SharedConfigurationDUnitTest extends JUnit4CacheTestCase {
public Object call() {
InternalLocator locator = (InternalLocator) Locator.getLocator();
SharedConfiguration sharedConfig = locator.getSharedConfiguration();
- sharedConfig.destroySharedConfiguration_forTestsOnly();
+ sharedConfig.destroySharedConfiguration();
locator.stop();
return null;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9d28009f/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationTestUtils.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationTestUtils.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationTestUtils.java
index 235f02e..1174c7d 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationTestUtils.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationTestUtils.java
@@ -30,7 +30,7 @@ public class SharedConfigurationTestUtils {
if (locator != null) {
SharedConfiguration sharedConfig = locator.getSharedConfiguration();
if (sharedConfig != null) {
- sharedConfig.destroySharedConfiguration_forTestsOnly();
+ sharedConfig.destroySharedConfiguration();
}
locator.stop();
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9d28009f/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationUsingDirDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationUsingDirDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationUsingDirDUnitTest.java
index 9cbb12c..8f80877 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationUsingDirDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationUsingDirDUnitTest.java
@@ -33,7 +33,6 @@ import java.util.Arrays;
import java.util.Properties;
import java.util.concurrent.TimeUnit;
-import org.junit.After;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -62,7 +61,7 @@ public class SharedConfigurationUsingDirDUnitTest extends JUnit4CacheTestCase {
SharedConfiguration sharedConfig = locator.getSharedConfiguration();
if (sharedConfig != null) {
- sharedConfig.destroySharedConfiguration_forTestsOnly();
+ sharedConfig.destroySharedConfiguration();
}
});
}