You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2016/02/15 18:08:45 UTC

svn commit: r1730571 - /qpid/java/branches/6.0.x/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/QpidSslRMIServerSocketFactory.java

Author: kwall
Date: Mon Feb 15 17:08:45 2016
New Revision: 1730571

URL: http://svn.apache.org/viewvc?rev=1730571&view=rev
Log:
NO-JIRA: Fix compliation issue introduced by 1730565 properly

Modified:
    qpid/java/branches/6.0.x/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/QpidSslRMIServerSocketFactory.java

Modified: qpid/java/branches/6.0.x/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/QpidSslRMIServerSocketFactory.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/QpidSslRMIServerSocketFactory.java?rev=1730571&r1=1730570&r2=1730571&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/QpidSslRMIServerSocketFactory.java (original)
+++ qpid/java/branches/6.0.x/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/QpidSslRMIServerSocketFactory.java Mon Feb 15 17:08:45 2016
@@ -65,8 +65,8 @@ public class QpidSslRMIServerSocketFacto
         }
 
         _sslContext = sslContext;
-        _enabledCipherSuites = new ArrayList(enabledCipherSuites);
-        _disabledCipherSuites = new ArrayList(disabledCipherSuites);
+        _enabledCipherSuites = enabledCipherSuites == null ? null : new ArrayList(enabledCipherSuites);
+        _disabledCipherSuites = disabledCipherSuites == null ? null : new ArrayList(disabledCipherSuites);
         _portAllocationAction = action;
 
         //TODO: settings + implementation for SSL client auth, updating equals and hashCode appropriately.



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org