svn commit: r1822382 - /jmeter/trunk/src/core/org/apache/jmeter/rmi/RmiUtils.java

[fschumacher]

Author: fschumacher
Date: Sat Jan 27 10:27:01 2018
New Revision: 1822382

URL: http://svn.apache.org/viewvc?rev=1822382&view=rev
Log:
Give an info message, when SSL for RMI has been disabled and don't try to use 
SSL

Modified:
    jmeter/trunk/src/core/org/apache/jmeter/rmi/RmiUtils.java

Modified: jmeter/trunk/src/core/org/apache/jmeter/rmi/RmiUtils.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/rmi/RmiUtils.java?rev=1822382&r1=1822381&r2=1822382&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/rmi/RmiUtils.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/rmi/RmiUtils.java Sat Jan 27 
10:27:01 2018
@@ -82,6 +82,10 @@ public final class RmiUtils {
     }
 
     public static RMIClientSocketFactory createClientSocketFactory() {
+        if (SSL_DISABLED) {
+            log.info("Disabling SSL for RMI as server.rmi.ssl.disable is set 
to 'true'");
+            return null;
+        }
         if (StringUtils.isBlank(KEYSTORE_FILE)) {
             Validate.validState(SSL_DISABLED,
                     "No keystore for RMI over SSL specified. Set 
'server.rmi.ssl.disable' to true, if this is intentional,"
@@ -97,6 +101,10 @@ public final class RmiUtils {
     }
 
     public static RMIServerSocketFactory createServerSocketFactory() throws 
RemoteException {
+        if (SSL_DISABLED) {
+            log.info("Disabling SSL for RMI as server.rmi.ssl.disable is set 
to 'true'");
+            return null;
+        }
         if (StringUtils.isBlank(KEYSTORE_FILE)) {
             Validate.validState(SSL_DISABLED,
                     "No keystore for RMI over SSL specified. Set 
'server.rmi.ssl.disable' to true, if this is intentional.");