Author: markt
Date: Tue Sep 14 07:55:26 2010
New Revision: 996780
URL: http://svn.apache.org/viewvc?rev=996780&view=rev
Log:
Fix most of the warnings in this package
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractInputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/InputFilter.java
tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/InternalInputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/InternalOutputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/OutputFilter.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractInputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractInputBuffer.java?rev=996780&r1=996779&r2=996780&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractInputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractInputBuffer.java Tue Sep
14 07:55:26 2010
@@ -309,6 +309,7 @@ public abstract class AbstractInputBuffe
/**
* Read some bytes.
*/
+ @Override
public int doRead(ByteChunk chunk, Request req)
throws IOException {
Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java?rev=996780&r1=996779&r2=996780&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java Tue
Sep 14 07:55:26 2010
@@ -184,6 +184,7 @@ public abstract class AbstractOutputBuff
* @return number of bytes written
* @throws IOException an underlying I/O error occurred
*/
+ @Override
public int doWrite(ByteChunk chunk, Response res)
throws IOException {
@@ -367,6 +368,7 @@ public abstract class AbstractOutputBuff
if (org.apache.coyote.Constants.IS_SECURITY_ENABLED){
AccessController.doPrivileged(
new PrivilegedAction<Void>(){
+ @Override
public Void run(){
buf[pos++] = Constants.CR;
buf[pos++] = Constants.LF;
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java?rev=996780&r1=996779&r2=996780&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java Tue Sep
14 07:55:26 2010
@@ -210,6 +210,7 @@ public class Http11NioProtocol extends A
protected ConcurrentHashMap<NioChannel, Http11NioProcessor>
connections =
new ConcurrentHashMap<NioChannel, Http11NioProcessor>();
protected ConcurrentLinkedQueue<Http11NioProcessor> recycledProcessors
= new ConcurrentLinkedQueue<Http11NioProcessor>() {
+ private static final long serialVersionUID = 1L;
protected AtomicInteger size = new AtomicInteger(0);
@Override
public boolean offer(Http11NioProcessor processor) {
Modified: tomcat/trunk/java/org/apache/coyote/http11/InputFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InputFilter.java?rev=996780&r1=996779&r2=996780&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/InputFilter.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InputFilter.java Tue Sep 14
07:55:26 2010
@@ -36,6 +36,7 @@ public interface InputFilter extends Inp
*
* @return Number of bytes read.
*/
+ @Override
public int doRead(ByteChunk chunk, Request unused)
throws IOException;
Modified: tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java?rev=996780&r1=996779&r2=996780&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java Tue
Sep 14 07:55:26 2010
@@ -325,6 +325,7 @@ public class InternalAprInputBuffer exte
throws IOException {
while (parseHeader()) {
+ // Loop until there are no more headers
}
parsingHeader = false;
@@ -339,6 +340,7 @@ public class InternalAprInputBuffer exte
* @return false after reading a blank line (which indicates that the
* HTTP header parsing is done
*/
+ @SuppressWarnings("null") // headerValue cannot be null
public boolean parseHeader()
throws IOException {
@@ -446,6 +448,7 @@ public class InternalAprInputBuffer exte
}
if (buf[pos] == Constants.CR) {
+ // Skip
} else if (buf[pos] == Constants.LF) {
eol = true;
} else if (buf[pos] == Constants.SP) {
@@ -612,6 +615,7 @@ public class InternalAprInputBuffer exte
/**
* Read bytes into the specified chunk.
*/
+ @Override
public int doRead(ByteChunk chunk, Request req )
throws IOException {
Modified:
tomcat/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java?rev=996780&r1=996779&r2=996780&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java Tue
Sep 14 07:55:26 2010
@@ -247,6 +247,7 @@ public class InternalAprOutputBuffer ext
/**
* Write chunk.
*/
+ @Override
public int doWrite(ByteChunk chunk, Response res)
throws IOException {
Modified: tomcat/trunk/java/org/apache/coyote/http11/InternalInputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalInputBuffer.java?rev=996780&r1=996779&r2=996780&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/InternalInputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalInputBuffer.java Tue Sep
14 07:55:26 2010
@@ -255,6 +255,7 @@ public class InternalInputBuffer extends
throws IOException {
while (parseHeader()) {
+ // Loop until we run out of headers
}
parsingHeader = false;
@@ -269,6 +270,7 @@ public class InternalInputBuffer extends
* @return false after reading a blank line (which indicates that the
* HTTP header parsing is done
*/
+ @SuppressWarnings("null") // headerValue cannot be null
public boolean parseHeader()
throws IOException {
@@ -376,6 +378,7 @@ public class InternalInputBuffer extends
}
if (buf[pos] == Constants.CR) {
+ // Skip
} else if (buf[pos] == Constants.LF) {
eol = true;
} else if (buf[pos] == Constants.SP) {
@@ -489,6 +492,7 @@ public class InternalInputBuffer extends
/**
* Read bytes into the specified chunk.
*/
+ @Override
public int doRead(ByteChunk chunk, Request req )
throws IOException {
Modified: tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java?rev=996780&r1=996779&r2=996780&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java Tue
Sep 14 07:55:26 2010
@@ -396,7 +396,11 @@ public class InternalNioInputBuffer exte
socket.getBufHandler().getReadBuffer().clear();
if ( block ) {
Selector selector = null;
- try { selector = getSelectorPool().get(); }catch ( IOException x )
{}
+ try {
+ selector = getSelectorPool().get();
+ } catch ( IOException x ) {
+ // Ignore
+ }
try {
NioEndpoint.KeyAttachment att =
(NioEndpoint.KeyAttachment)socket.getAttachment(false);
if ( att == null ) throw new IOException("Key must be
cancelled.");
@@ -569,6 +573,7 @@ public class InternalNioInputBuffer exte
}
if (buf[pos] == Constants.CR) {
+ // Skip
} else if (buf[pos] == Constants.LF) {
eol = true;
} else if (buf[pos] == Constants.SP) {
@@ -706,6 +711,7 @@ public class InternalNioInputBuffer exte
/**
* Read bytes into the specified chunk.
*/
+ @Override
public int doRead(ByteChunk chunk, Request req )
throws IOException {
Modified:
tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java?rev=996780&r1=996779&r2=996780&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java Tue
Sep 14 07:55:26 2010
@@ -307,6 +307,7 @@ public class InternalNioOutputBuffer ext
/**
* Write chunk.
*/
+ @Override
public int doWrite(ByteChunk chunk, Response res)
throws IOException {
Modified: tomcat/trunk/java/org/apache/coyote/http11/InternalOutputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalOutputBuffer.java?rev=996780&r1=996779&r2=996780&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/InternalOutputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalOutputBuffer.java Tue
Sep 14 07:55:26 2010
@@ -234,6 +234,7 @@ public class InternalOutputBuffer extend
/**
* Callback to write data from the buffer.
*/
+ @Override
public void realWriteBytes(byte cbuf[], int off, int len)
throws IOException {
if (len > 0) {
@@ -256,6 +257,7 @@ public class InternalOutputBuffer extend
/**
* Write chunk.
*/
+ @Override
public int doWrite(ByteChunk chunk, Response res)
throws IOException {
Modified: tomcat/trunk/java/org/apache/coyote/http11/OutputFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/OutputFilter.java?rev=996780&r1=996779&r2=996780&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/OutputFilter.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/OutputFilter.java Tue Sep 14
07:55:26 2010
@@ -36,6 +36,7 @@ public interface OutputFilter extends Ou
*
* @return number of bytes written by the filter
*/
+ @Override
public int doWrite(ByteChunk chunk, Response unused)
throws IOException;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
