You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cxf.apache.org by dk...@apache.org on 2013/06/14 04:41:19 UTC

svn commit: r1492931 - /cxf/trunk/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java

Author: dkulp
Date: Fri Jun 14 02:41:19 2013
New Revision: 1492931

URL: http://svn.apache.org/r1492931
Log:
[CXF-5063] Use the properly updated Keymanagers

Modified:
    cxf/trunk/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java

Modified: cxf/trunk/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java?rev=1492931&r1=1492930&r2=1492931&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java (original)
+++ cxf/trunk/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java Fri Jun 14 02:41:19 2013
@@ -796,7 +796,7 @@ public class AsyncHTTPConduit extends UR
         ctx.getClientSessionContext().setSessionTimeout(tlsClientParameters.getSslCacheTimeout());
         KeyManager[] keyManagers = tlsClientParameters.getKeyManagers();
         if (tlsClientParameters.getCertAlias() != null) {
-            getKeyManagersWithCertAlias(tlsClientParameters, keyManagers);
+            keyManagers = getKeyManagersWithCertAlias(tlsClientParameters, keyManagers);
         }
         ctx.init(keyManagers, tlsClientParameters.getTrustManagers(),
                  tlsClientParameters.getSecureRandom());