From: markt Date: Fri, 2 May 2008 21:25:56 +0000 (+0000) Subject: Code clean up. Remove unused methods, unnecessary casts/code, fix generics warnings... X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=75f52fa05437f6e6d1dac3f24034320b99533c1e;p=tomcat7.0 Code clean up. Remove unused methods, unnecessary casts/code, fix generics warnings etc reported by Eclipse. No functional change. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@652918 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/java/org/apache/coyote/http11/Http11AprProcessor.java b/java/org/apache/coyote/http11/Http11AprProcessor.java index d1a8ead19..250dc8e68 100644 --- a/java/org/apache/coyote/http11/Http11AprProcessor.java +++ b/java/org/apache/coyote/http11/Http11AprProcessor.java @@ -470,7 +470,7 @@ public class Http11AprProcessor implements ActionHook { */ protected void addFilter(String className) { try { - Class clazz = Class.forName(className); + Class clazz = Class.forName(className); Object obj = clazz.newInstance(); if (obj instanceof InputFilter) { inputBuffer.addFilter((InputFilter) obj); @@ -530,22 +530,6 @@ public class Http11AprProcessor implements ActionHook { /** - * General use method - * - * @param sArray the StringArray - * @param value string - */ - private boolean inStringArray(String sArray[], String value) { - for (int i = 0; i < sArray.length; i++) { - if (sArray[i].equals(value)) { - return true; - } - } - return false; - } - - - /** * Checks if any entry in the string array starts with the specified value * * @param sArray the StringArray @@ -1144,9 +1128,8 @@ public class Http11AprProcessor implements ActionHook { } // User key size sslO = new Integer(SSLSocket.getInfoI(socket, SSL.SSL_INFO_CIPHER_USEKEYSIZE)); - if (sslO != null) { - request.setAttribute(AprEndpoint.KEY_SIZE_KEY, sslO); - } + request.setAttribute(AprEndpoint.KEY_SIZE_KEY, sslO); + // SSL session ID sslO = SSLSocket.getInfoS(socket, SSL.SSL_INFO_SESSION_ID); if (sslO != null) { @@ -1474,7 +1457,7 @@ public class Http11AprProcessor implements ActionHook { int port = 0; int mult = 1; for (int i = valueL - 1; i > colonPos; i--) { - int charValue = HexUtils.DEC[(int) valueB[i + valueS]]; + int charValue = HexUtils.DEC[valueB[i + valueS]]; if (charValue == -1) { // Invalid character error = true; diff --git a/java/org/apache/coyote/http11/Http11NioProcessor.java b/java/org/apache/coyote/http11/Http11NioProcessor.java index 86df02a64..008e348a3 100644 --- a/java/org/apache/coyote/http11/Http11NioProcessor.java +++ b/java/org/apache/coyote/http11/Http11NioProcessor.java @@ -89,7 +89,6 @@ public class Http11NioProcessor implements ActionHook { this.endpoint = endpoint; request = new Request(); - int readTimeout = endpoint.getSoTimeout(); inputBuffer = new InternalNioInputBuffer(request, maxHttpHeaderSize); request.setInputBuffer(inputBuffer); @@ -478,7 +477,7 @@ public class Http11NioProcessor implements ActionHook { */ protected void addFilter(String className) { try { - Class clazz = Class.forName(className); + Class clazz = Class.forName(className); Object obj = clazz.newInstance(); if (obj instanceof InputFilter) { inputBuffer.addFilter((InputFilter) obj); @@ -538,22 +537,6 @@ public class Http11NioProcessor implements ActionHook { /** - * General use method - * - * @param sArray the StringArray - * @param value string - */ - private boolean inStringArray(String sArray[], String value) { - for (int i = 0; i < sArray.length; i++) { - if (sArray[i].equals(value)) { - return true; - } - } - return false; - } - - - /** * Checks if any entry in the string array starts with the specified value * * @param sArray the StringArray @@ -811,8 +794,6 @@ public class Http11NioProcessor implements ActionHook { int keepAliveLeft = maxKeepAliveRequests; long soTimeout = endpoint.getSoTimeout(); - int limit = 0; - boolean keptAlive = false; boolean openSocket = false; boolean recycle = true; @@ -840,7 +821,7 @@ public class Http11NioProcessor implements ActionHook { } request.setStartTime(System.currentTimeMillis()); if (!disableUploadTimeout) { //only for body, not for request headers - socket.getIOChannel().socket().setSoTimeout((int)timeout); + socket.getIOChannel().socket().setSoTimeout(timeout); } } catch (IOException e) { if (log.isDebugEnabled()) { @@ -1507,7 +1488,7 @@ public class Http11NioProcessor implements ActionHook { int port = 0; int mult = 1; for (int i = valueL - 1; i > colonPos; i--) { - int charValue = HexUtils.DEC[(int) valueB[i + valueS]]; + int charValue = HexUtils.DEC[valueB[i + valueS]]; if (charValue == -1) { // Invalid character error = true; diff --git a/java/org/apache/coyote/http11/Http11Processor.java b/java/org/apache/coyote/http11/Http11Processor.java index b886c48f3..6ac15addd 100644 --- a/java/org/apache/coyote/http11/Http11Processor.java +++ b/java/org/apache/coyote/http11/Http11Processor.java @@ -460,7 +460,7 @@ public class Http11Processor implements ActionHook { */ protected void addFilter(String className) { try { - Class clazz = Class.forName(className); + Class clazz = Class.forName(className); Object obj = clazz.newInstance(); if (obj instanceof InputFilter) { inputBuffer.addFilter((InputFilter) obj); @@ -520,22 +520,6 @@ public class Http11Processor implements ActionHook { /** - * General use method - * - * @param sArray the StringArray - * @param value string - */ - private boolean inStringArray(String sArray[], String value) { - for (int i = 0; i < sArray.length; i++) { - if (sArray[i].equals(value)) { - return true; - } - } - return false; - } - - - /** * Checks if any entry in the string array starts with the specified value * * @param sArray the StringArray @@ -1386,7 +1370,7 @@ public class Http11Processor implements ActionHook { int port = 0; int mult = 1; for (int i = valueL - 1; i > colonPos; i--) { - int charValue = HexUtils.DEC[(int) valueB[i + valueS]]; + int charValue = HexUtils.DEC[valueB[i + valueS]]; if (charValue == -1) { // Invalid character error = true; @@ -1555,9 +1539,9 @@ public class Http11Processor implements ActionHook { // Add date header String date = null; if (org.apache.coyote.Constants.IS_SECURITY_ENABLED){ - date = (String)AccessController.doPrivileged( - new PrivilegedAction() { - public Object run(){ + date = AccessController.doPrivileged( + new PrivilegedAction() { + public String run(){ return FastHttpDateFormat.getCurrentDate(); } }