[karaf] branch karaf-4.2.x updated: [KARAF-6855]JMX over SSL doesn't work anymore

[ffang]

This is an automated email from the ASF dual-hosted git repository.

ffang pushed a commit to branch karaf-4.2.x
in repository https://gitbox.apache.org/repos/asf/karaf.git


The following commit(s) were added to refs/heads/karaf-4.2.x by this push:
     new 4b0ccb5  [KARAF-6855]JMX over SSL doesn't work anymore
4b0ccb5 is described below

commit 4b0ccb5648766c913ea425f63e18b44ad63d89df
Author: Freeman Fang <freeman.f...@gmail.com>
AuthorDate: Wed Sep 16 19:15:15 2020 -0400

    [KARAF-6855]JMX over SSL doesn't work anymore
    
    (cherry picked from commit 58c7885a6bfed734ec455019102c6f2059b4179b)
---
 .../java/org/apache/karaf/management/ConnectorServerFactory.java     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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 9a58ed2..570ff01 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
@@ -392,8 +392,9 @@ public class ConnectorServerFactory {
 
         MBeanInvocationHandler handler = new MBeanInvocationHandler(server, 
guard);
         MBeanServer guardedServer = (MBeanServer) 
Proxy.newProxyInstance(server.getClass().getClassLoader(), new Class[]{ 
MBeanServer.class }, handler);
-
-        rmiServer = new RMIJRMPServerImpl(url.getPort(), null, null, 
environment);
+        rmiServer = new RMIJRMPServerImpl(url.getPort(), 
+                                          
(RMIClientSocketFactory)environment.get(RMIConnectorServer.RMI_CLIENT_SOCKET_FACTORY_ATTRIBUTE),
 
+                                          
(RMIServerSocketFactory)environment.get(RMIConnectorServer.RMI_SERVER_SOCKET_FACTORY_ATTRIBUTE),
 environment);
 
         // Create the connector server now.
         this.connectorServer = new RMIConnectorServer(url, environment, 
rmiServer, guardedServer);