You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by gr...@apache.org on 2014/11/28 18:08:26 UTC
incubator-brooklyn git commit: No JMX agent required for JMX_RMI mode
Repository: incubator-brooklyn
Updated Branches:
refs/heads/master ee4397ea4 -> a8203c1ed
No JMX agent required for JMX_RMI mode
Signed-off-by: @duncangrant
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/a8203c1e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/a8203c1e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/a8203c1e
Branch: refs/heads/master
Commit: a8203c1edccaa6abf732d26a3f351312d792c73b
Parents: ee4397e
Author: Andrew Kennedy <gr...@apache.org>
Authored: Fri Nov 28 16:51:15 2014 +0000
Committer: Andrew Kennedy <gr...@apache.org>
Committed: Fri Nov 28 17:07:16 2014 +0000
----------------------------------------------------------------------
.../base/src/main/java/brooklyn/entity/java/JmxSupport.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a8203c1e/software/base/src/main/java/brooklyn/entity/java/JmxSupport.java
----------------------------------------------------------------------
diff --git a/software/base/src/main/java/brooklyn/entity/java/JmxSupport.java b/software/base/src/main/java/brooklyn/entity/java/JmxSupport.java
index bddd85f..418fda1 100644
--- a/software/base/src/main/java/brooklyn/entity/java/JmxSupport.java
+++ b/software/base/src/main/java/brooklyn/entity/java/JmxSupport.java
@@ -201,9 +201,11 @@ public class JmxSupport implements UsesJmx {
}
public List<String> getJmxJavaConfigOptions() {
- if (getJmxAgentMode()==JmxAgentModes.NONE)
+ if (EnumSet.<JmxAgentModes>of(JmxAgentModes.NONE, JmxAgentModes.JMX_RMI).contains(getJmxAgentMode())) {
return MutableList.of();
- return MutableList.of(String.format("-javaagent:%s", getJmxAgentJarDestinationFilePath()));
+ } else {
+ return MutableList.of(String.format("-javaagent:%s", getJmxAgentJarDestinationFilePath()));
+ }
}
public String getJmxAgentJarDestinationFilePath() {