commit b9641e0949f5de5a3c8079758fdd638889614143
author Nobuaki Sukegawa <nsuke@apache.org> Fri Nov 27 09:46:15 2015 +0900
committer Roger Meier <roger@apache.org> Fri Nov 27 23:32:40 2015 +0100
tree 2e9eff2a2f49cf7dcffb42face8a60c973d33da9
parent ef3cf819e120cc46ef8e1b35baa07eae3a39126a

THRIFT-3450 NPE when using SSL

This closes #717

lib/java/src/org/apache/thrift/transport/TSSLTransportFactory.java

diff --git a/lib/java/src/org/apache/thrift/transport/TSSLTransportFactory.java b/lib/java/src/org/apache/thrift/transport/TSSLTransportFactory.java
index 76c98c8..7f63b07 100755
--- a/lib/java/src/org/apache/thrift/transport/TSSLTransportFactory.java
+++ b/lib/java/src/org/apache/thrift/transport/TSSLTransportFactory.java
@@ -309,7 +309,7 @@
       if (protocol != null) {
         this.protocol = protocol;
       }
-      this.cipherSuites = Arrays.copyOf(cipherSuites, cipherSuites.length);
+      this.cipherSuites = cipherSuites != null ? Arrays.copyOf(cipherSuites, cipherSuites.length) : null;
       this.clientAuth = clientAuth;
     }