Author: ay
Date: Tue Aug 7 08:21:43 2012
New Revision: 1370137
URL: http://svn.apache.org/viewvc?rev=1370137&view=rev
Log:
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.6.x-fixes/ (props changed)
cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java
Propchange: cxf/branches/2.6.x-fixes/
('svn:mergeinfo' removed)
Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java?rev=1370137&r1=1370136&r2=1370137&view=diff
==============================================================================
---
cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java
(original)
+++
cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java
Tue Aug 7 08:21:43 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()
