Author: markt
Date: Mon Jan 11 13:58:22 2016
New Revision: 1724028
URL: http://svn.apache.org/viewvc?rev=1724028&view=rev
Log:
SSLImplementation.getName() is not used so remove it.
Further simplify the factory part of SSLImplementation
Remove OpenSSLImplementation.IMPLEMENTATION_NAME. Since it is the class name,
use the class name.
Modified:
tomcat/trunk/java/org/apache/catalina/connector/Connector.java
tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/SSLImplementation.java
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLImplementation.java
Modified: tomcat/trunk/java/org/apache/catalina/connector/Connector.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Connector.java?rev=1724028&r1=1724027&r2=1724028&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/Connector.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Connector.java Mon Jan 11
13:58:22 2016
@@ -1008,7 +1008,7 @@ public class Connector extends Lifecycle
AbstractHttp11JsseProtocol<?> jsseProtocolHandler =
(AbstractHttp11JsseProtocol<?>) protocolHandler;
if (jsseProtocolHandler.getSslImplementationName() == null) {
// OpenSSL is compatible with the JSSE configuration, so use
it if APR is available
-
jsseProtocolHandler.setSslImplementationName(OpenSSLImplementation.IMPLEMENTATION_NAME);
+
jsseProtocolHandler.setSslImplementationName(OpenSSLImplementation.class.getName());
}
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java?rev=1724028&r1=1724027&r2=1724028&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java Mon
Jan 11 13:58:22 2016
@@ -64,7 +64,7 @@ public abstract class AbstractJsseEndpoi
@Override
protected Type getSslConfigType() {
- if
(OpenSSLImplementation.IMPLEMENTATION_NAME.equals(sslImplementationName)) {
+ if
(OpenSSLImplementation.class.getName().equals(sslImplementationName)) {
return SSLHostConfig.Type.EITHER;
} else {
return SSLHostConfig.Type.JSSE;
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SSLImplementation.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SSLImplementation.java?rev=1724028&r1=1724027&r2=1724028&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/SSLImplementation.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SSLImplementation.java Mon Jan
11 13:58:22 2016
@@ -35,22 +35,11 @@ public abstract class SSLImplementation
private static final StringManager sm =
StringManager.getManager(SSLImplementation.class);
/**
- * Obtain an instance (not a singleton) of the default implementation.
- * Currently, this is the standard JSSE implementation that ships as part
of
- * the JRE. Tomcat also provides an OpenSSL based implementation.
- *
- * @return The default implementation
- */
- public static SSLImplementation getInstance() {
- return new JSSEImplementation();
- }
-
-
- /**
* Obtain an instance (not a singleton) of the implementation with the
given
* class name.
*
- * @param className The class name of the required implementation
+ * @param className The class name of the required implementation or null
to
+ * use the default (currently {@link JSSEImplementation}.
*
* @return An instance of the required implementation
*
@@ -60,7 +49,7 @@ public abstract class SSLImplementation
public static SSLImplementation getInstance(String className)
throws ClassNotFoundException {
if (className == null)
- return getInstance();
+ return new JSSEImplementation();
try {
Class<?> clazz = Class.forName(className);
@@ -75,8 +64,6 @@ public abstract class SSLImplementation
}
- public abstract String getImplementationName();
-
public abstract SSLSupport getSSLSupport(SSLSession session);
public abstract SSLUtil getSSLUtil(SSLHostConfig sslHostConfig,
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java?rev=1724028&r1=1724027&r2=1724028&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java
Mon Jan 11 13:58:22 2016
@@ -41,11 +41,6 @@ public class JSSEImplementation extends
}
@Override
- public String getImplementationName(){
- return "JSSE";
- }
-
- @Override
public SSLSupport getSSLSupport(SSLSession session) {
return new JSSESupport(session);
}
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLImplementation.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLImplementation.java?rev=1724028&r1=1724027&r2=1724028&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLImplementation.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLImplementation.java
Mon Jan 11 13:58:22 2016
@@ -27,13 +27,6 @@ import org.apache.tomcat.util.net.jsse.J
public class OpenSSLImplementation extends SSLImplementation {
- public static final String IMPLEMENTATION_NAME =
"org.apache.tomcat.util.net.openssl.OpenSSLImplementation";
-
- @Override
- public String getImplementationName() {
- return "OpenSSl";
- }
-
@Override
public SSLSupport getSSLSupport(SSLSession session) {
return new JSSESupport(session);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
