You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2015/04/15 15:23:56 UTC
karaf git commit: [KARAF-3659] NullPointerException fixed during
shutdown due to incorrectly configured JMX SSL
Repository: karaf
Updated Branches:
refs/heads/karaf-3.0.x c27f3a141 -> 32bd4ad84
[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/32bd4ad8
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/32bd4ad8
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/32bd4ad8
Branch: refs/heads/karaf-3.0.x
Commit: 32bd4ad84af47a5f625067a950741f734ff3615e
Parents: c27f3a1
Author: Jay SenSharma <jo...@gmail.com>
Authored: Sun Apr 12 11:51:57 2015 +0530
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Wed Apr 15 14:29:14 2015 +0200
----------------------------------------------------------------------
.../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/32bd4ad8/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 919d1d2..5660792 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
@@ -283,7 +283,9 @@ public class ConnectorServerFactory {
public void destroy() throws Exception {
try {
- this.connectorServer.stop();
+ if (this.connectorServer != null) {
+ this.connectorServer.stop();
+ }
} finally {
doUnregister(this.objectName);
}