You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2018/10/03 16:14:46 UTC

[cxf] 05/07: Removing unused getSecureSocketsProtocol method

This is an automated email from the ASF dual-hosted git repository.

coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit ae994168f50894010f1f148ec3b6f35b17e4b63b
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Wed Oct 3 15:29:51 2018 +0100

    Removing unused getSecureSocketsProtocol method
---
 .../org/apache/cxf/configuration/jsse/SSLUtils.java     | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

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 a974159..acea7cc 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
@@ -62,7 +62,6 @@ public final class SSLUtils {
 
     private static final String DEFAULT_KEYSTORE_TYPE = "PKCS12";
     private static final String DEFAULT_TRUST_STORE_TYPE = "JKS";
-    private static final String DEFAULT_SECURE_SOCKET_PROTOCOL = "TLSv1";
 
     private static final String HTTPS_CIPHER_SUITES = "https.cipherSuites";
 
@@ -157,7 +156,7 @@ public final class SSLUtils {
                     is = getResourceAsStream(location);
                 }
             }
-            
+
             if (is != null) {
                 TrustManagerFactory tmf =
                     TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
@@ -569,18 +568,4 @@ public final class SSLUtils {
         return trustStoreProvider;
     }
 
-    public static String getSecureSocketProtocol(String secureSocketProtocol,
-                                                 Logger log) {
-        if (secureSocketProtocol != null) {
-            LogUtils.log(log,
-                         Level.FINE,
-                         "SECURE_SOCKET_PROTOCOL_SET",
-                         secureSocketProtocol);
-        } else {
-            LogUtils.log(log, Level.FINE, "SECURE_SOCKET_PROTOCOL_NOT_SET");
-            secureSocketProtocol = DEFAULT_SECURE_SOCKET_PROTOCOL;
-        }
-        return secureSocketProtocol;
-    }
-
 }