Repository: cxf
Updated Branches:
  refs/heads/master 276c2bf08 -> d292979c5


[CXF-6000] Wrong default algorithm is used for TrustManagerFactory instantiation


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/d292979c
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/d292979c
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/d292979c

Branch: refs/heads/master
Commit: d292979c57a02dac0c755c3fe176fee89c16e82a
Parents: 276c2bf
Author: Akitoshi Yoshida <a...@apache.org>
Authored: Fri Sep 12 18:38:59 2014 +0200
Committer: Akitoshi Yoshida <a...@apache.org>
Committed: Fri Sep 12 18:39:18 2014 +0200

----------------------------------------------------------------------
 .../org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/d292979c/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java
----------------------------------------------------------------------
diff --git 
a/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java
 
b/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java
index 080db9e..f936d84 100644
--- 
a/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java
+++ 
b/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java
@@ -330,7 +330,7 @@ public final class TLSParameterJaxBUtils {
 
         String alg = tmc.isSetFactoryAlgorithm()
                      ? tmc.getFactoryAlgorithm()
-                     : KeyManagerFactory.getDefaultAlgorithm();
+                     : TrustManagerFactory.getDefaultAlgorithm();
 
         TrustManagerFactory fac =
                      tmc.isSetProvider()

Reply via email to