Fix error in JmxFeedTest
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/948bf24e Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/948bf24e Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/948bf24e Branch: refs/heads/master Commit: 948bf24ee5b4b5d52650e4aeb9da2a32a7b76568 Parents: 11332d3 Author: Andrew Kennedy <[email protected]> Authored: Fri Aug 29 19:22:52 2014 +0100 Committer: Andrew Kennedy <[email protected]> Committed: Sat Aug 30 17:27:08 2014 +0100 ---------------------------------------------------------------------- software/base/src/main/java/brooklyn/entity/java/JmxSupport.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/948bf24e/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 7aa8bb0..88f76ea 100644 --- a/software/base/src/main/java/brooklyn/entity/java/JmxSupport.java +++ b/software/base/src/main/java/brooklyn/entity/java/JmxSupport.java @@ -158,7 +158,6 @@ public class JmxSupport implements UsesJmx { init(); HostAndPort jmx = BrooklynAccessUtils.getBrooklynAccessibleAddress(entity, entity.getAttribute(JMX_PORT)); - HostAndPort rmi = BrooklynAccessUtils.getBrooklynAccessibleAddress(entity, entity.getAttribute(RMI_REGISTRY_PORT)); if (EnumSet.of(JmxAgentModes.JMXMP, JmxAgentModes.JMXMP_AND_RMI).contains(getJmxAgentMode())) { return JmxHelper.toJmxmpUrl(jmx.getHostText(), jmx.getPort()); @@ -167,6 +166,7 @@ public class JmxSupport implements UsesJmx { fixPortsForModeNone(); } // this will work for agent or agentless + HostAndPort rmi = BrooklynAccessUtils.getBrooklynAccessibleAddress(entity, entity.getAttribute(RMI_REGISTRY_PORT)); return JmxHelper.toRmiJmxUrl(jmx.getHostText(), jmx.getPort(), rmi.getPort(), entity.getAttribute(JMX_CONTEXT)); }
