Inital fix for issue 109 via using -D on JVM

jxu-sv · Oct 16, 2014 · 00ec088 · 00ec088
1 parent 6665212
commit 00ec088
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/agent/jsr160/src/main/java/org/jolokia/jsr160/Jsr160RequestDispatcher.java b/agent/jsr160/src/main/java/org/jolokia/jsr160/Jsr160RequestDispatcher.java
@@ -21,7 +21,10 @@
 
 import javax.management.*;
 import javax.management.remote.*;
+import javax.management.remote.rmi.RMIConnectorServer;
 import javax.naming.Context;
+import javax.rmi.ssl.SslRMIClientSocketFactory;
+import javax.rmi.ssl.SslRMIServerSocketFactory;
 
 import org.jolokia.backend.executor.MBeanServerExecutor;
 import org.jolokia.backend.RequestDispatcher;
@@ -124,6 +127,13 @@ protected Map<String,Object> prepareEnv(Map<String, String> pTargetConfig) {
             ret.put(Context.SECURITY_CREDENTIALS, password);
             ret.put("jmx.remote.credentials",new String[] { user, password });
         }
+
+        if (!System.getProperty("javax.net.ssl.trustStore", "NULL").equals("NULL")) {
+            SslRMIClientSocketFactory csf = new SslRMIClientSocketFactory();
+            SslRMIServerSocketFactory ssf = new SslRMIServerSocketFactory();
+            ret.put(RMIConnectorServer.RMI_CLIENT_SOCKET_FACTORY_ATTRIBUTE, csf);
+            ret.put(RMIConnectorServer.RMI_SERVER_SOCKET_FACTORY_ATTRIBUTE, ssf);
+        }
         return ret;
     }