From: schultz Date: Fri, 21 Jan 2011 18:04:38 +0000 (+0000) Subject: Reverted inadvertently-committed files from r1061929. X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=0acfdb25e71c0ad012e49fa09dbe27d7a426757d;p=tomcat7.0 Reverted inadvertently-committed files from r1061929. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1061940 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/java/org/apache/catalina/ant/AbstractCatalinaTask.java b/java/org/apache/catalina/ant/AbstractCatalinaTask.java index b89ee6ed5..c248d42e6 100644 --- a/java/org/apache/catalina/ant/AbstractCatalinaTask.java +++ b/java/org/apache/catalina/ant/AbstractCatalinaTask.java @@ -170,7 +170,6 @@ public abstract class AbstractCatalinaTask extends BaseRedirectorHelperTask { URLConnection conn = null; InputStreamReader reader = null; try { - openRedirector(); // Create a connection for this command conn = (new URL(url + command)).openConnection(); diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java b/java/org/apache/tomcat/util/net/AprEndpoint.java index c89d7512a..dcb912eec 100644 --- a/java/org/apache/tomcat/util/net/AprEndpoint.java +++ b/java/org/apache/tomcat/util/net/AprEndpoint.java @@ -242,9 +242,6 @@ public class AprEndpoint extends AbstractEndpoint { public String getSSLCipherSuite() { return SSLCipherSuite; } public void setSSLCipherSuite(String SSLCipherSuite) { this.SSLCipherSuite = SSLCipherSuite; } - protected boolean SSLFIPSMode = false; - public boolean getSSLFIPSMode() { return SSLFIPSMode; } - public void setSSLFIPSMode(boolean SSLFIPSMode) { this.SSLFIPSMode = SSLFIPSMode; } /** * SSL certificate file.