svn commit: r1079354 - in /tomcat/trunk/java/org/apache/tomcat/util/net/jsse: JSSEFactory.java JSSEImplementation.java

[markt]

Author: markt
Date: Tue Mar  8 13:50:07 2011
New Revision: 1079354

URL: http://svn.apache.org/viewvc?rev=1079354&view=rev
Log:
Remove JSSEFactory. Now we no longer need to support older JSSE versions, this 
layer of abstraction is not required.

Removed:
    tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEFactory.java
Modified:
    tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java

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=1079354&r1=1079353&r2=1079354&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 
Tue Mar  8 13:50:07 2011
@@ -20,6 +20,7 @@ package org.apache.tomcat.util.net.jsse;
 import java.net.Socket;
 
 import javax.net.ssl.SSLSession;
+import javax.net.ssl.SSLSocket;
 
 import org.apache.tomcat.util.net.AbstractEndpoint;
 import org.apache.tomcat.util.net.SSLImplementation;
@@ -35,13 +36,6 @@ import org.apache.tomcat.util.net.Server
         
 public class JSSEImplementation extends SSLImplementation {
 
-    private JSSEFactory factory = null;
-
-    public JSSEImplementation() {
-        factory = new JSSEFactory();
-    }
-
-
     @Override
     public String getImplementationName(){
         return "JSSE";
@@ -49,20 +43,17 @@ public class JSSEImplementation extends 
       
     @Override
     public ServerSocketFactory getServerSocketFactory(AbstractEndpoint 
endpoint)  {
-        ServerSocketFactory ssf = factory.getSocketFactory(endpoint);
-        return ssf;
+        return new JSSESocketFactory(endpoint);
     } 
 
     @Override
     public SSLSupport getSSLSupport(Socket s) {
-        SSLSupport ssls = factory.getSSLSupport(s);
-        return ssls;
+        return new JSSESupport((SSLSocket) s);
     }
 
     @Override
     public SSLSupport getSSLSupport(SSLSession session) {
-        SSLSupport ssls = factory.getSSLSupport(session);
-        return ssls;
+        return new JSSESupport(session);
     }
 
 }



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