Author: markt
Date: Sun Sep 26 22:58:38 2010
New Revision: 1001553
URL: http://svn.apache.org/viewvc?rev=1001553&view=rev
Log:
Remove some unused code.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
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=1001553&r1=1001552&r2=1001553&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java Sun Sep
26 22:58:38 2010
@@ -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";
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java?rev=1001553&r1=1001552&r2=1001553&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java Sun Sep
26 22:58:38 2010
@@ -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 =
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=1001553&r1=1001552&r2=1001553&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
Sun Sep 26 22:58:38 2010
@@ -36,9 +36,6 @@ public class JSSEImplementation extends
{
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 {
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java?rev=1001553&r1=1001552&r2=1001553&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
Sun Sep 26 22:58:38 2010
@@ -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;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
