Author: remy.maucherat(a)jboss.com Date: 2008-05-02 17:56:55 -0400 (Fri, 02 May 2008) New Revision: 607 Modified: trunk/java/org/apache/coyote/http11/Http11AprProcessor.java trunk/java/org/apache/coyote/http11/Http11Processor.java Log: - Port patch: very small code cleanup. Modified: trunk/java/org/apache/coyote/http11/Http11AprProcessor.java =================================================================== --- trunk/java/org/apache/coyote/http11/Http11AprProcessor.java 2008-05-02 16:47:59 UTC (rev 606) +++ trunk/java/org/apache/coyote/http11/Http11AprProcessor.java 2008-05-02 21:56:55 UTC (rev 607) @@ -513,7 +513,7 @@ */ 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); @@ -573,22 +573,6 @@ /** - * 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 @@ -1208,9 +1192,7 @@ } // 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) { @@ -1563,7 +1545,7 @@ 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; Modified: trunk/java/org/apache/coyote/http11/Http11Processor.java =================================================================== --- trunk/java/org/apache/coyote/http11/Http11Processor.java 2008-05-02 16:47:59 UTC (rev 606) +++ trunk/java/org/apache/coyote/http11/Http11Processor.java 2008-05-02 21:56:55 UTC (rev 607) @@ -460,7 +460,7 @@ */ 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 @@ /** - * 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 @@ -1380,7 +1364,7 @@ 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; @@ -1549,9 +1533,9 @@ // 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<String>() { + public String run(){ return FastHttpDateFormat.getCurrentDate(); } }