brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From grk...@apache.org
Subject git commit: Move JMX agent install to resources method
Date Wed, 03 Sep 2014 18:00:05 GMT
Repository: incubator-brooklyn
Updated Branches:
  refs/heads/master a0b10ff73 -> 3213671cd


Move JMX agent install to resources method


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/3213671c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/3213671c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/3213671c

Branch: refs/heads/master
Commit: 3213671cd9e7215bcc8da3199ab9c41847881199
Parents: a0b10ff
Author: Andrew Kennedy <grkvlt@apache.org>
Authored: Wed Sep 3 17:34:17 2014 +0100
Committer: Andrew Kennedy <grkvlt@apache.org>
Committed: Wed Sep 3 17:34:42 2014 +0100

----------------------------------------------------------------------
 .../entity/java/JavaSoftwareProcessSshDriver.java  | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3213671c/software/base/src/main/java/brooklyn/entity/java/JavaSoftwareProcessSshDriver.java
----------------------------------------------------------------------
diff --git a/software/base/src/main/java/brooklyn/entity/java/JavaSoftwareProcessSshDriver.java
b/software/base/src/main/java/brooklyn/entity/java/JavaSoftwareProcessSshDriver.java
index d4e5156..9b3874e 100644
--- a/software/base/src/main/java/brooklyn/entity/java/JavaSoftwareProcessSshDriver.java
+++ b/software/base/src/main/java/brooklyn/entity/java/JavaSoftwareProcessSshDriver.java
@@ -436,7 +436,7 @@ public abstract class JavaSoftwareProcessSshDriver extends AbstractSoftwareProce
             log.warn("Error checking/fixing Java hostname bug (continuing): "+e, e);
         }
     }
-    
+
     @Override
     public void setup() {
         DynamicTasks.queue("install java", new Runnable() { public void run() {
@@ -445,15 +445,20 @@ public abstract class JavaSoftwareProcessSshDriver extends AbstractSoftwareProce
 
         // TODO check java version
 
-        if (isJmxEnabled()) {
-            DynamicTasks.queue("install jmx", new Runnable() { public void run() {
-                installJmxSupport(); }}); 
-        }
-
         if (getEntity().getConfig(UsesJava.CHECK_JAVA_HOSTNAME_BUG)) {
             DynamicTasks.queue("check java hostname bug", new Runnable() { public void run()
{
                 checkJavaHostnameBug(); }});
         }
     }
 
+    @Override
+    public void resources() {
+        super.resources();
+
+        if (isJmxEnabled()) {
+            DynamicTasks.queue("install jmx", new Runnable() { public void run() {
+                installJmxSupport(); }});
+        }
+    }
+
 }


Mime
View raw message