Repository: cxf Updated Branches: refs/heads/2.7.x-fixes 20b341bd2 -> 02a2189c2
Fixing backmerge Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/02a2189c Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/02a2189c Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/02a2189c Branch: refs/heads/2.7.x-fixes Commit: 02a2189c255ae9b217025455209717ce2dad6fc9 Parents: 7a35401 Author: Colm O hEigeartaigh <[email protected]> Authored: Mon Apr 20 15:59:14 2015 +0100 Committer: Colm O hEigeartaigh <[email protected]> Committed: Mon Apr 20 16:41:15 2015 +0100 ---------------------------------------------------------------------- .../cxf/transport/https/HttpsURLConnectionFactory.java | 9 --------- 1 file changed, 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/02a2189c/rt/transports/http/src/main/java/org/apache/cxf/transport/https/HttpsURLConnectionFactory.java ---------------------------------------------------------------------- diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/https/HttpsURLConnectionFactory.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/https/HttpsURLConnectionFactory.java index f7afe64..a415d59 100644 --- a/rt/transports/http/src/main/java/org/apache/cxf/transport/https/HttpsURLConnectionFactory.java +++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/https/HttpsURLConnectionFactory.java @@ -163,21 +163,12 @@ public class HttpsURLConnectionFactory { .getInstance(protocol, provider); ctx.getClientSessionContext().setSessionTimeout(tlsClientParameters.getSslCacheTimeout()); KeyManager[] keyManagers = tlsClientParameters.getKeyManagers(); -<<<<<<< HEAD - if (tlsClientParameters.getCertAlias() != null) { - getKeyManagersWithCertAlias(tlsClientParameters, keyManagers); - } - if (keyManagers == null) { - keyManagers = SSLUtils.getDefaultKeyStoreManagers(LOG); - } -======= if (keyManagers == null) { keyManagers = SSLUtils.getDefaultKeyStoreManagers(LOG); } if (tlsClientParameters.getCertAlias() != null) { getKeyManagersWithCertAlias(tlsClientParameters, keyManagers); } ->>>>>>> d657398... [CXF-6359] - NullPointerException when certAlias specified but no keyManagers are configured. Thanks to Tom Pasierb for the patch ctx.init(keyManagers, tlsClientParameters.getTrustManagers(), tlsClientParameters.getSecureRandom());
