cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject svn commit: r1369901 - /cxf/trunk/api/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java
Date Mon, 06 Aug 2012 18:09:59 GMT
Author: ay
Date: Mon Aug  6 18:09:58 2012
New Revision: 1369901

URL: http://svn.apache.org/viewvc?rev=1369901&view=rev
Log:
[CXF-4454] JSSE KeyManagers and TrustManager XML configurations are ignored if they contain
no keystore element

Modified:
    cxf/trunk/api/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java

Modified: cxf/trunk/api/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java?rev=1369901&r1=1369900&r2=1369901&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java
(original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java
Mon Aug  6 18:09:58 2012
@@ -249,10 +249,6 @@ public final class TLSParameterJaxBUtils
 
         KeyStore keyStore = getKeyStore(kmc.getKeyStore());
 
-        if (keyStore == null) {
-            return null;
-        }
-
         String alg = kmc.isSetFactoryAlgorithm()
                      ? kmc.getFactoryAlgorithm()
                      : KeyManagerFactory.getDefaultAlgorithm();
@@ -285,9 +281,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