Author: markt
Date: Mon Jun 21 11:54:13 2010
New Revision: 956537
URL: http://svn.apache.org/viewvc?rev=956537&view=rev
Log:
Fix Eclipse warnings in this package. No functional change.
Modified:
tomcat/trunk/java/org/apache/coyote/http11/filters/BufferedInputFilter.java
tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedOutputFilter.java
tomcat/trunk/java/org/apache/coyote/http11/filters/GzipOutputFilter.java
tomcat/trunk/java/org/apache/coyote/http11/filters/SavedRequestInputFilter.java
tomcat/trunk/java/org/apache/coyote/http11/filters/VoidInputFilter.java
tomcat/trunk/java/org/apache/coyote/http11/filters/VoidOutputFilter.java
Modified:
tomcat/trunk/java/org/apache/coyote/http11/filters/BufferedInputFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/filters/BufferedInputFilter.java?rev=956537&r1=956536&r2=956537&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/filters/BufferedInputFilter.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/filters/BufferedInputFilter.java
Mon Jun 21 11:54:13 2010
@@ -89,11 +89,11 @@ public class BufferedInputFilter impleme
public int doRead(ByteChunk chunk, Request request) throws IOException {
if (hasRead || buffered.getLength() <= 0) {
return -1;
- } else {
- chunk.setBytes(buffered.getBytes(), buffered.getStart(),
- buffered.getLength());
- hasRead = true;
}
+
+ chunk.setBytes(buffered.getBytes(), buffered.getStart(),
+ buffered.getLength());
+ hasRead = true;
return chunk.getLength();
}
Modified:
tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java?rev=956537&r1=956536&r2=956537&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
Mon Jun 21 11:54:13 2010
@@ -176,6 +176,7 @@ public class ChunkedInputFilter implemen
* Read the content length from the request.
*/
public void setRequest(Request request) {
+ // NOOP: Request isn't used so ignore it
}
@@ -187,6 +188,7 @@ public class ChunkedInputFilter implemen
// Consume extra bytes : parse the stream until the end chunk is found
while (doRead(readChunk, null) >= 0) {
+ // NOOP: Just consume the input
}
// Return the number of extra bytes which were consumed
@@ -275,6 +277,7 @@ public class ChunkedInputFilter implemen
}
if (buf[pos] == Constants.CR) {
+ // FIXME: Improve parsing to check for CRLF
} else if (buf[pos] == Constants.LF) {
eol = true;
} else if (buf[pos] == Constants.SEMI_COLON) {
Modified:
tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedOutputFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedOutputFilter.java?rev=956537&r1=956536&r2=956537&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedOutputFilter.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedOutputFilter.java
Mon Jun 21 11:54:13 2010
@@ -142,6 +142,7 @@ public class ChunkedOutputFilter impleme
* after the response header processing is complete.
*/
public void setResponse(Response response) {
+ // NOOP: No need for parameters from response in this filter
}
@@ -172,6 +173,7 @@ public class ChunkedOutputFilter impleme
* Make the filter ready to process the next request.
*/
public void recycle() {
+ // NOOP: Nothing to recycle
}
Modified:
tomcat/trunk/java/org/apache/coyote/http11/filters/GzipOutputFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/filters/GzipOutputFilter.java?rev=956537&r1=956536&r2=956537&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/filters/GzipOutputFilter.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/filters/GzipOutputFilter.java
Mon Jun 21 11:54:13 2010
@@ -99,6 +99,7 @@ public class GzipOutputFilter implements
* after the response header processing is complete.
*/
public void setResponse(Response response) {
+ // NOOP: No need for parameters from response in this filter
}
@@ -166,9 +167,9 @@ public class GzipOutputFilter implements
buffer.doWrite(outputChunk, null);
}
@Override
- public void flush() throws IOException {}
+ public void flush() throws IOException {/*NOOP*/}
@Override
- public void close() throws IOException {}
+ public void close() throws IOException {/*NOOP*/}
}
Modified:
tomcat/trunk/java/org/apache/coyote/http11/filters/SavedRequestInputFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/filters/SavedRequestInputFilter.java?rev=956537&r1=956536&r2=956537&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/coyote/http11/filters/SavedRequestInputFilter.java
(original)
+++
tomcat/trunk/java/org/apache/coyote/http11/filters/SavedRequestInputFilter.java
Mon Jun 21 11:54:13 2010
@@ -91,6 +91,7 @@ public class SavedRequestInputFilter imp
* Set the next buffer in the filter pipeline (has no effect).
*/
public void setBuffer(InputBuffer buffer) {
+ // NOOP since this filter will be providing the request body
}
/**
Modified:
tomcat/trunk/java/org/apache/coyote/http11/filters/VoidInputFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/filters/VoidInputFilter.java?rev=956537&r1=956536&r2=956537&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/filters/VoidInputFilter.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/filters/VoidInputFilter.java Mon
Jun 21 11:54:13 2010
@@ -75,6 +75,7 @@ public class VoidInputFilter implements
* Set the associated request.
*/
public void setRequest(Request request) {
+ // NOOP: Request isn't used so ignore it
}
@@ -82,6 +83,7 @@ public class VoidInputFilter implements
* Set the next buffer in the filter pipeline.
*/
public void setBuffer(InputBuffer buffer) {
+ // NOOP: No body to read
}
@@ -89,6 +91,7 @@ public class VoidInputFilter implements
* Make the filter ready to process the next request.
*/
public void recycle() {
+ // NOOP: Nothing to recycle
}
Modified:
tomcat/trunk/java/org/apache/coyote/http11/filters/VoidOutputFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/filters/VoidOutputFilter.java?rev=956537&r1=956536&r2=956537&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/filters/VoidOutputFilter.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/filters/VoidOutputFilter.java
Mon Jun 21 11:54:13 2010
@@ -83,6 +83,7 @@ public class VoidOutputFilter implements
* after the response header processing is complete.
*/
public void setResponse(Response response) {
+ // NOOP: No need for parameters from response in this filter
}
@@ -98,6 +99,7 @@ public class VoidOutputFilter implements
* Make the filter ready to process the next request.
*/
public void recycle() {
+ // NOOP: Nothing to recycle
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
