cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [3/3] cxf git commit: Fixing merge
Date Fri, 17 Feb 2017 13:48:07 GMT
Fixing merge


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

Branch: refs/heads/3.1.x-fixes
Commit: ed2b69ec9b6e50790845a2ae7dd48875acb66b74
Parents: ac280e8
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Fri Feb 17 13:47:56 2017 +0000
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Fri Feb 17 13:47:56 2017 +0000

----------------------------------------------------------------------
 .../java/org/apache/cxf/configuration/jsse/SSLUtils.java     | 8 --------
 .../apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java | 6 ------
 2 files changed, 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/ed2b69ec/core/src/main/java/org/apache/cxf/configuration/jsse/SSLUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/configuration/jsse/SSLUtils.java b/core/src/main/java/org/apache/cxf/configuration/jsse/SSLUtils.java
index 71f24fd..fb9556d 100644
--- a/core/src/main/java/org/apache/cxf/configuration/jsse/SSLUtils.java
+++ b/core/src/main/java/org/apache/cxf/configuration/jsse/SSLUtils.java
@@ -569,13 +569,8 @@ public final class SSLUtils {
         } else {
             //Can default to JKS
             trustStoreType = SystemPropertyAction.getProperty("javax.net.ssl.trustStoreType");
-<<<<<<< HEAD
-            if (trustStoreType == null) {    
-                trustStoreType = DEFAULT_TRUST_STORE_TYPE;
-=======
             if (trustStoreType == null) {
                 trustStoreType = def;
->>>>>>> 19a4d72... CXF-7252 - TLSParameterJaxBUtils.getTrustManagers
getting password from wrong system property
                 logMsg = "TRUST_STORE_TYPE_NOT_SET";
             } else {
                 logMsg = "TRUST_STORE_TYPE_SYSTEM_SET";
@@ -585,8 +580,6 @@ public final class SSLUtils {
         return trustStoreType;
     }
     
-<<<<<<< HEAD
-=======
     public static String getTruststorePassword(String trustStorePassword,
                                              Logger log) {
         String logMsg = null;
@@ -619,7 +612,6 @@ public final class SSLUtils {
         return trustStoreProvider;
     }
 
->>>>>>> 19a4d72... CXF-7252 - TLSParameterJaxBUtils.getTrustManagers
getting password from wrong system property
     public static String getSecureSocketProtocol(String secureSocketProtocol,
                                                  Logger log) {
         if (secureSocketProtocol != null) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/ed2b69ec/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 44eca7b..8050e38 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
@@ -133,18 +133,12 @@ public final class TLSParameterJaxBUtils {
                 password = tmp.toCharArray();
             }
         }
-<<<<<<< HEAD
-        String provider = SSLUtils.getKeystoreProvider(kst.isSetProvider() 
-                                                       ? kst.getProvider() : null,
-                                                       LOG);
-=======
         String provider = null;
         if (trustStore) {
             provider = SSLUtils.getTruststoreProvider(kst.isSetProvider() ? kst.getProvider()
: null, LOG);
         } else {
             provider = SSLUtils.getKeystoreProvider(kst.isSetProvider() ? kst.getProvider()
: null, LOG);
         }
->>>>>>> 19a4d72... CXF-7252 - TLSParameterJaxBUtils.getTrustManagers
getting password from wrong system property
         KeyStore keyStore = provider == null
                     ? KeyStore.getInstance(type)
                     : KeyStore.getInstance(type, provider);


Mime
View raw message