cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r984889 - in /cxf/branches/2.2.x-fixes: ./ rt/transports/http/src/main/java/org/apache/cxf/configuration/jsse/spring/TLSClientParametersConfig.java
Date Thu, 12 Aug 2010 18:09:51 GMT
Author: dkulp
Date: Thu Aug 12 18:09:51 2010
New Revision: 984889

URL: http://svn.apache.org/viewvc?rev=984889&view=rev
Log:
Merged revisions 984886 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r984886 | dkulp | 2010-08-12 14:08:50 -0400 (Thu, 12 Aug 2010) | 2 lines
  
  [CXF-2863] If useHttpsURLConnectionDefaultSslSocketFactory is true,
  don't create keystores and such
........

Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    cxf/branches/2.2.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/configuration/jsse/spring/TLSClientParametersConfig.java

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.2.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/configuration/jsse/spring/TLSClientParametersConfig.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/configuration/jsse/spring/TLSClientParametersConfig.java?rev=984889&r1=984888&r2=984889&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/configuration/jsse/spring/TLSClientParametersConfig.java
(original)
+++ cxf/branches/2.2.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/configuration/jsse/spring/TLSClientParametersConfig.java
Thu Aug 12 18:09:51 2010
@@ -59,7 +59,9 @@ public final class TLSClientParametersCo
         throws GeneralSecurityException,
                IOException {
 
-        TLSClientParameters ret = new TLSClientParameters();
+        TLSClientParameters ret = new TLSClientParameters(); 
+        boolean usingDefaults = params.isUseHttpsURLConnectionDefaultSslSocketFactory();
+        
         if (params.isDisableCNCheck()) {
             ret.setDisableCNCheck(true);
         }
@@ -81,16 +83,16 @@ public final class TLSClientParametersCo
         if (params.isSetJsseProvider()) {
             ret.setJsseProvider(params.getJsseProvider());
         }
-        if (params.isSetSecureRandomParameters()) {
+        if (params.isSetSecureRandomParameters() && !usingDefaults) {
             ret.setSecureRandom(
                 TLSParameterJaxBUtils.getSecureRandom(
                         params.getSecureRandomParameters()));
         }
-        if (params.isSetKeyManagers()) {
+        if (params.isSetKeyManagers() && !usingDefaults) {
             ret.setKeyManagers(
                 TLSParameterJaxBUtils.getKeyManagers(params.getKeyManagers()));
         }
-        if (params.isSetTrustManagers()) {
+        if (params.isSetTrustManagers() && !usingDefaults) {
             ret.setTrustManagers(
                 TLSParameterJaxBUtils.getTrustManagers(
                         params.getTrustManagers()));



Mime
View raw message