r1079367 was a little too enthusiastic.

The "if (!initialized)" tests weren't required by the init() call are

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

diff --git a/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java b/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
index 250281a..cecf041 100644 (file)
--- a/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
+++ b/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
@@ -146,6 +146,7 @@ public class JSSESocketFactory implements ServerSocketFactory, SSLUtil {
     public ServerSocket createSocket (int port)
         throws IOException
     {
+        init();
         ServerSocket socket = sslProxy.createServerSocket(port);
         initServerSocket(socket);
         return socket;
@@ -155,6 +156,7 @@ public class JSSESocketFactory implements ServerSocketFactory, SSLUtil {
     public ServerSocket createSocket (int port, int backlog)
         throws IOException
     {
+        init();
         ServerSocket socket = sslProxy.createServerSocket(port, backlog);
         initServerSocket(socket);
         return socket;
@@ -165,6 +167,7 @@ public class JSSESocketFactory implements ServerSocketFactory, SSLUtil {
                                       InetAddress ifAddress)
         throws IOException
     {   
+        init();
         ServerSocket socket = sslProxy.createServerSocket(port, backlog,
                                                           ifAddress);
         initServerSocket(socket);