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 14:27:28 UTC
[1/2] karaf git commit: [KARAF-3659] NullPointerException fixed
during shutdown due to incorrectly configured JMX SSL
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 <jo...@gmail.com>
Authored: Sun Apr 12 11:51:57 2015 +0530
Committer: Jay SenSharma <jo...@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);
}
[2/2] karaf git commit: Merge branch 'KARAF-3659' of
https://github.com/jaysensharma/karaf-1
Posted by jb...@apache.org.
Merge branch 'KARAF-3659' of https://github.com/jaysensharma/karaf-1
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/d14fee97
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/d14fee97
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/d14fee97
Branch: refs/heads/master
Commit: d14fee97a046eb768a72150f89ba4d6ceaa903a6
Parents: c410e1d ebd0489
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Wed Apr 15 14:12:53 2015 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Wed Apr 15 14:12:53 2015 +0200
----------------------------------------------------------------------
.../java/org/apache/karaf/management/ConnectorServerFactory.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------