You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ay...@apache.org on 2012/08/06 20:09:59 UTC
svn commit: r1369901 -
/cxf/trunk/api/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java
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()