You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by al...@apache.org on 2014/11/05 01:21:35 UTC
[5/8] git commit: On rmi registry port not available,
log what config said
On rmi registry port not available, log what config said
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/3eb86535
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/3eb86535
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/3eb86535
Branch: refs/heads/master
Commit: 3eb86535f4b507c892a8912febf0574ec9851df7
Parents: 5f4cc2d
Author: Aled Sage <al...@gmail.com>
Authored: Tue Nov 4 23:06:58 2014 +0000
Committer: Aled Sage <al...@gmail.com>
Committed: Tue Nov 4 23:06:58 2014 +0000
----------------------------------------------------------------------
software/base/src/main/java/brooklyn/entity/java/JmxSupport.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3eb86535/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 88f76ea..0d93d02 100644
--- a/software/base/src/main/java/brooklyn/entity/java/JmxSupport.java
+++ b/software/base/src/main/java/brooklyn/entity/java/JmxSupport.java
@@ -269,7 +269,8 @@ public class JmxSupport implements UsesJmx {
switch (getJmxAgentMode()) {
case JMXMP_AND_RMI:
- result.put(JmxmpAgent.RMI_REGISTRY_PORT_PROPERTY, Preconditions.checkNotNull(entity.getAttribute(UsesJmx.RMI_REGISTRY_PORT), "registry port"));
+ Integer rmiRegistryPort = Preconditions.checkNotNull(entity.getAttribute(UsesJmx.RMI_REGISTRY_PORT), "registry port (config val %s)", entity.getConfig(UsesJmx.RMI_REGISTRY_PORT));
+ result.put(JmxmpAgent.RMI_REGISTRY_PORT_PROPERTY, rmiRegistryPort);
case JMXMP:
if (jmxRemotePort==null || jmxRemotePort<=0)
throw new IllegalStateException("Unsupported JMX port "+jmxRemotePort+" - when applying system properties ("+getJmxAgentMode()+" / "+getEntity()+")");