Author: markt
Date: Thu May  7 14:04:56 2015
New Revision: 1678214

URL: http://svn.apache.org/r1678214
Log:
Move the JSSE specific config to the AbstractJsseEndpoint
Modified:
    tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java
    tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
    tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java

Modified: 
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java?rev=1678214&r1=1678213&r2=1678214&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java 
Thu May  7 14:04:56 2015
@@ -16,15 +16,23 @@
  */
 package org.apache.coyote.http11;
 
-import org.apache.tomcat.util.net.AbstractEndpoint;
+import org.apache.tomcat.util.net.AbstractJsseEndpoint;
 
 public abstract class AbstractHttp11JsseProtocol<S>
         extends AbstractHttp11Protocol<S> {
 
-    public AbstractHttp11JsseProtocol(AbstractEndpoint<S> endpoint) {
+    public AbstractHttp11JsseProtocol(AbstractJsseEndpoint<S> endpoint) {
         super(endpoint);
     }
 
+
+    @Override
+    protected AbstractJsseEndpoint<S> getEndpoint() {
+        // Over-ridden to add cast
+        return (AbstractJsseEndpoint<S>) super.getEndpoint();
+    }
+
+
     public String getSslImplementationName() { return 
getEndpoint().getSslImplementationName(); }
     public void setSslImplementationName(String s) { 
getEndpoint().setSslImplementationName(s); }
 }

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java?rev=1678214&r1=1678213&r2=1678214&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java Thu May  
7 14:04:56 2015
@@ -964,14 +964,6 @@ public abstract class AbstractEndpoint<S
 
     }
 
-    // --------------------  SSL related properties --------------------
-
-    private String sslImplementationName = null;
-    public String getSslImplementationName() { return sslImplementationName; }
-    public void setSslImplementationName(String s) {
-        this.sslImplementationName = s;
-    }
-
 
     protected final Set<SocketWrapperBase<S>> waitingRequests = Collections
             .newSetFromMap(new ConcurrentHashMap<SocketWrapperBase<S>, 
Boolean>());

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=1678214&r1=1678213&r2=1678214&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java Thu 
May  7 14:04:56 2015
@@ -29,8 +29,21 @@ import org.apache.tomcat.util.net.jsse.N
 
 public abstract class AbstractJsseEndpoint<S> extends AbstractEndpoint<S> {
 
+    private String sslImplementationName = null;
+
     private SSLImplementation sslImplementation = null;
 
+
+    public String getSslImplementationName() {
+        return sslImplementationName;
+    }
+
+
+    public void setSslImplementationName(String s) {
+        this.sslImplementationName = s;
+    }
+
+
     public SSLImplementation getSslImplementation() {
         return sslImplementation;
     }



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to