geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jinmeil...@apache.org
Subject [4/4] geode git commit: wip
Date Thu, 15 Dec 2016 18:57:30 GMT
wip


Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/d5954c16
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/d5954c16
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/d5954c16

Branch: refs/heads/feature/GEODE-2197
Commit: d5954c161034914d3f7e6cb2b59536cdb5ecb717
Parents: eb937f5
Author: Jinmei Liao <jiliao@pivotal.io>
Authored: Wed Dec 14 20:39:34 2016 -0800
Committer: Jinmei Liao <jiliao@pivotal.io>
Committed: Wed Dec 14 20:39:34 2016 -0800

----------------------------------------------------------------------
 .../org/apache/geode/test/dunit/rules/LocatorStarterRule.java    | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/geode/blob/d5954c16/geode-core/src/test/java/org/apache/geode/test/dunit/rules/LocatorStarterRule.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/LocatorStarterRule.java
b/geode-core/src/test/java/org/apache/geode/test/dunit/rules/LocatorStarterRule.java
index 6fc0d03..934cc0f 100644
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/LocatorStarterRule.java
+++ b/geode-core/src/test/java/org/apache/geode/test/dunit/rules/LocatorStarterRule.java
@@ -60,9 +60,7 @@ public class LocatorStarterRule extends ExternalResource implements Serializable
     if (properties.containsKey(JMX_MANAGER_PORT)) {
       int jmxPort = Integer.parseInt(properties.getProperty(JMX_MANAGER_PORT));
       if (jmxPort > 0) {
-        if (!properties.containsKey(JMX_MANAGER)) {
-          properties.put(JMX_MANAGER, "true");
-        }
+        // on a locator jmx-manager is default to true, but jmx-manager-start is false
         if (!properties.containsKey(JMX_MANAGER_START)) {
           properties.put(JMX_MANAGER_START, "true");
         }


Mime
View raw message