Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id F2D48200BF0 for ; Thu, 15 Dec 2016 19:57:28 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id F184F160B2D; Thu, 15 Dec 2016 18:57:28 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 45E20160B30 for ; Thu, 15 Dec 2016 19:57:28 +0100 (CET) Received: (qmail 45034 invoked by uid 500); 15 Dec 2016 18:57:27 -0000 Mailing-List: contact commits-help@geode.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@geode.apache.org Delivered-To: mailing list commits@geode.apache.org Received: (qmail 45014 invoked by uid 99); 15 Dec 2016 18:57:27 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 15 Dec 2016 18:57:27 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 3524AF0BF2; Thu, 15 Dec 2016 18:57:27 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jinmeiliao@apache.org To: commits@geode.apache.org Date: Thu, 15 Dec 2016 18:57:30 -0000 Message-Id: In-Reply-To: <284926e4ddc24812918e0a99c766d8ff@git.apache.org> References: <284926e4ddc24812918e0a99c766d8ff@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/4] geode git commit: wip archived-at: Thu, 15 Dec 2016 18:57:29 -0000 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 Authored: Wed Dec 14 20:39:34 2016 -0800 Committer: Jinmei Liao 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"); }