brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From henev...@apache.org
Subject [41/50] brooklyn-library git commit: Fix NPE in TomcatServer.disconnectSensors (when inactive)
Date Mon, 01 Feb 2016 17:47:11 GMT
Fix NPE in TomcatServer.disconnectSensors (when inactive)

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

Branch: refs/heads/0.6.0
Commit: c2b9bc332bb38b216d664a72b0d80beea31a53f3
Parents: 36bde45
Author: Aled Sage <aled.sage@gmail.com>
Authored: Fri Nov 15 10:52:41 2013 +0000
Committer: Aled Sage <aled.sage@gmail.com>
Committed: Fri Nov 15 10:52:41 2013 +0000

----------------------------------------------------------------------
 .../java/brooklyn/entity/webapp/tomcat/TomcatServerImpl.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/c2b9bc33/software/webapp/src/main/java/brooklyn/entity/webapp/tomcat/TomcatServerImpl.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/main/java/brooklyn/entity/webapp/tomcat/TomcatServerImpl.java
b/software/webapp/src/main/java/brooklyn/entity/webapp/tomcat/TomcatServerImpl.java
index 596eb7e..a6c1b72 100644
--- a/software/webapp/src/main/java/brooklyn/entity/webapp/tomcat/TomcatServerImpl.java
+++ b/software/webapp/src/main/java/brooklyn/entity/webapp/tomcat/TomcatServerImpl.java
@@ -1,6 +1,6 @@
 package brooklyn.entity.webapp.tomcat;
 
-import static java.lang.String.*;
+import static java.lang.String.format;
 
 import java.util.concurrent.TimeUnit;
 
@@ -71,7 +71,7 @@ public class TomcatServerImpl extends JavaWebAppSoftwareProcessImpl implements
T
     public void disconnectSensors() {
         super.disconnectSensors();
         if (getDriver().isJmxEnabled()) {
-           if (jmxFeed.isActivated()) jmxFeed.stop();
+           if (jmxFeed != null) jmxFeed.stop();
         } else {
             disconnectServiceUpIsRunning();
         }


Mime
View raw message