Repository: thrift Updated Branches: refs/heads/master ef3cf819e -> b9641e094
THRIFT-3450 NPE when using SSL This closes #717 Project: http://git-wip-us.apache.org/repos/asf/thrift/repo Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/b9641e09 Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/b9641e09 Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/b9641e09 Branch: refs/heads/master Commit: b9641e0949f5de5a3c8079758fdd638889614143 Parents: ef3cf81 Author: Nobuaki Sukegawa <[email protected]> Authored: Fri Nov 27 09:46:15 2015 +0900 Committer: Roger Meier <[email protected]> Committed: Fri Nov 27 23:32:40 2015 +0100 ---------------------------------------------------------------------- lib/java/src/org/apache/thrift/transport/TSSLTransportFactory.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/thrift/blob/b9641e09/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 @@ public class TSSLTransportFactory { 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; }
