From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 30 Jan 2008 20:52:49 +0000 (+0000)
Subject: The NIO connector is hard-coded to use the JSSE SSL implementation so just use it... 
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=f5e969ad6458bad46b7f89f9cd8b6264a14cda30;p=tomcat7.0

The NIO connector is hard-coded to use the JSSE SSL implementation so just use it directly. This patch allows the JSSE dependency in the SSL abstraction to be removed (this will be in a later patch).

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@616896 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/java/org/apache/coyote/http11/Http11NioProtocol.java b/java/org/apache/coyote/http11/Http11NioProtocol.java
index 567002d60..dc6d83559 100644
--- a/java/org/apache/coyote/http11/Http11NioProtocol.java
+++ b/java/org/apache/coyote/http11/Http11NioProtocol.java
@@ -39,7 +39,7 @@ import org.apache.tomcat.util.modeler.Registry;
 import org.apache.tomcat.util.net.NioChannel;
 import org.apache.tomcat.util.net.NioEndpoint;
 import org.apache.tomcat.util.net.NioEndpoint.Handler;
-import org.apache.tomcat.util.net.SSLImplementation;
+import org.apache.tomcat.util.net.jsse.JSSEImplementation;
 import org.apache.tomcat.util.net.SecureNioChannel;
 import org.apache.tomcat.util.net.SocketStatus;
 import org.apache.tomcat.util.res.StringManager;
@@ -56,7 +56,7 @@ import org.apache.tomcat.util.res.StringManager;
  */
 public class Http11NioProtocol implements ProtocolHandler, MBeanRegistration
 {
-    protected SSLImplementation sslImplementation = null;
+    protected JSSEImplementation sslImplementation = null;
     
     public Http11NioProtocol() {
         cHandler = new Http11ConnectionHandler( this );
@@ -134,7 +134,7 @@ public class Http11NioProtocol implements ProtocolHandler, MBeanRegistration
         
         try {
             ep.init();
-            sslImplementation = SSLImplementation.getInstance("org.apache.tomcat.util.net.jsse.JSSEImplementation");
+            sslImplementation = new JSSEImplementation();
         } catch (Exception ex) {
             log.error(sm.getString("http11protocol.endpoint.initerror"), ex);
             throw ex;