Remove some unused code.

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

diff --git a/java/org/apache/tomcat/util/net/AbstractEndpoint.java b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
index 3ec598c..917a6d4 100644 (file)
--- a/java/org/apache/tomcat/util/net/AbstractEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
@@ -93,7 +93,6 @@ public abstract class AbstractEndpoint {
     public static final String SSL_ATTR_KEYSTORE_PROVIDER = "keystoreProvider";
     public static final String SSL_ATTR_SSL_PROTOCOL = "sslProtocol";
     public static final String SSL_ATTR_CIPHERS = "ciphers";
-    public static final String SSL_ATTR_CIPHERS_ARRAY = "ciphersArray";
     public static final String SSL_ATTR_KEY_ALIAS = "keyAlias";
     public static final String SSL_ATTR_KEY_PASS = "keyPass";
     public static final String SSL_ATTR_TRUSTSTORE_FILE = "truststoreFile";

diff --git a/java/org/apache/tomcat/util/net/NioSelectorPool.java b/java/org/apache/tomcat/util/net/NioSelectorPool.java
index 33f350f..cfaa962 100644 (file)
--- a/java/org/apache/tomcat/util/net/NioSelectorPool.java
+++ b/java/org/apache/tomcat/util/net/NioSelectorPool.java
@@ -43,8 +43,6 @@ public class NioSelectorPool {
     public NioSelectorPool() {
     }
     
-    protected static int threadCount = 0;
-    
     private static final Log log = LogFactory.getLog(NioSelectorPool.class);
 
     protected final static boolean SHARED =

diff --git a/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java b/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java
index 6a0949f..92072cf 100644 (file)
--- a/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java
+++ b/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java
@@ -36,9 +36,6 @@ public class JSSEImplementation extends SSLImplementation
 {
     static final String SSLSocketClass = "javax.net.ssl.SSLSocket";
 
-    static final org.apache.juli.logging.Log logger = 
-        org.apache.juli.logging.LogFactory.getLog(JSSEImplementation.class);
-
     private JSSEFactory factory = null;
 
     public JSSEImplementation() throws ClassNotFoundException {

diff --git a/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java b/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
index 3f4830f..bf9540c 100644 (file)
--- a/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
+++ b/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
@@ -83,7 +83,6 @@ public class JSSESocketFactory
 
     // Defaults - made public where re-used
     static String defaultProtocol = "TLS";
-    static boolean defaultClientAuth = false;
     static String defaultKeystoreType = "JKS";
     private static final String defaultKeystoreFile
         = System.getProperty("user.home") + "/.keystore";
@@ -96,7 +95,6 @@ public class JSSESocketFactory
         org.apache.juli.logging.LogFactory.getLog(JSSESocketFactory.class);
 
     protected boolean initialized;
-    protected String clientAuth = "false";
     protected SSLServerSocketFactory sslProxy = null;
     protected String[] enabledCiphers;
     protected boolean allowUnsafeLegacyRenegotiation = false;