cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject svn commit: r1370147 - in /cxf/branches/2.5.x-fixes: ./ rt/transports/http/src/main/java/org/apache/cxf/configuration/jsse/spring/TLSParameterJaxBUtils.java
Date Tue, 07 Aug 2012 08:53:47 GMT
Author: ay
Date: Tue Aug  7 08:53:47 2012
New Revision: 1370147

URL: http://svn.apache.org/viewvc?rev=1370147&view=rev
Log:
Merged revisions 1370137 via  svn merge from
https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes

........
  r1370137 | ay | 2012-08-07 10:21:43 +0200 (Tue, 07 Aug 2012) | 9 lines
  
  Merged revisions 1369901 via  svn merge from
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r1369901 | ay | 2012-08-06 20:09:58 +0200 (Mon, 06 Aug 2012) | 1 line
    
    [CXF-4454] JSSE KeyManagers and TrustManager XML configurations are ignored if they contain
no keystore element
  ........
  
........

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

Propchange: cxf/branches/2.5.x-fixes/
            ('svn:mergeinfo' removed)

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

Modified: cxf/branches/2.5.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/configuration/jsse/spring/TLSParameterJaxBUtils.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/configuration/jsse/spring/TLSParameterJaxBUtils.java?rev=1370147&r1=1370146&r2=1370147&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/configuration/jsse/spring/TLSParameterJaxBUtils.java
(original)
+++ cxf/branches/2.5.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/configuration/jsse/spring/TLSParameterJaxBUtils.java
Tue Aug  7 08:53:47 2012
@@ -250,10 +250,6 @@ public final class TLSParameterJaxBUtils
 
         KeyStore keyStore = getKeyStore(kmc.getKeyStore());
 
-        if (keyStore == null) {
-            return null;
-        }
-
         String alg = kmc.isSetFactoryAlgorithm()
                      ? kmc.getFactoryAlgorithm()
                      : KeyManagerFactory.getDefaultAlgorithm();
@@ -286,9 +282,6 @@ public final class TLSParameterJaxBUtils
                 : (tmc.isSetCertStore()
                     ? getKeyStore(tmc.getCertStore())
                     : (KeyStore) null);
-        if (keyStore == null) {
-            return null;
-        }
 
         String alg = tmc.isSetFactoryAlgorithm()
                      ? tmc.getFactoryAlgorithm()



Mime
View raw message