cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1492934 - /cxf/branches/2.7.x-fixes/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
Date Fri, 14 Jun 2013 02:44:36 GMT
Author: dkulp
Date: Fri Jun 14 02:44:36 2013
New Revision: 1492934

URL: http://svn.apache.org/r1492934
Log:
Merged revisions 1492931 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1492931 | dkulp | 2013-06-13 22:41:19 -0400 (Thu, 13 Jun 2013) | 2 lines

  [CXF-5063] Use the properly updated Keymanagers

........

Modified:
    cxf/branches/2.7.x-fixes/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java

Modified: cxf/branches/2.7.x-fixes/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java?rev=1492934&r1=1492933&r2=1492934&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
(original)
+++ cxf/branches/2.7.x-fixes/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
Fri Jun 14 02:44:36 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());



Mime
View raw message