Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes e33fa0c6f -> 174e54b92


[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/174e54b9
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/174e54b9
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/174e54b9

Branch: refs/heads/3.0.x-fixes
Commit: 174e54b922bbe3a27405bd71933ba18e1145dd7a
Parents: e33fa0c
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:40:46 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/174e54b9/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 8996c8b..3ce5fcf 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
@@ -298,7 +298,7 @@ public final class TLSParameterJaxBUtils {
 
         String alg = tmc.isSetFactoryAlgorithm()
                      ? tmc.getFactoryAlgorithm()
-                     : KeyManagerFactory.getDefaultAlgorithm();
+                     : TrustManagerFactory.getDefaultAlgorithm();
 
         TrustManagerFactory fac =
                      tmc.isSetProvider()

Reply via email to