karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject [1/2] karaf git commit: [KARAF-3659] NullPointerException fixed during shutdown due to incorrectly configured JMX SSL
Date Wed, 15 Apr 2015 12:27:28 GMT
Repository: karaf
Updated Branches:
  refs/heads/master c410e1db4 -> d14fee97a


[KARAF-3659] NullPointerException fixed during shutdown due to incorrectly configured JMX
SSL


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

Branch: refs/heads/master
Commit: ebd04896f2b941550a66b0f79c9e0625748f7932
Parents: 317aab8
Author: Jay SenSharma <joy.sensharma@gmail.com>
Authored: Sun Apr 12 11:51:57 2015 +0530
Committer: Jay SenSharma <joy.sensharma@gmail.com>
Committed: Sun Apr 12 12:46:43 2015 +0530

----------------------------------------------------------------------
 .../java/org/apache/karaf/management/ConnectorServerFactory.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/ebd04896/management/server/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java
----------------------------------------------------------------------
diff --git a/management/server/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java
b/management/server/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java
index f962427..2897d67 100644
--- a/management/server/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java
+++ b/management/server/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java
@@ -273,7 +273,9 @@ public class ConnectorServerFactory {
 
     public void destroy() throws Exception {
         try {
-            this.connectorServer.stop();
+            if (this.connectorServer != null) {
+                this.connectorServer.stop();
+            }
         } finally {
             doUnregister(this.objectName);
         }


Mime
View raw message