Author: markt
Date: Mon May 26 21:09:46 2014
New Revision: 1597649
URL: http://svn.apache.org/r1597649
Log:
Simplify available() and isFinished() as current implementation broke Comet
chat example.
Modified:
tomcat/trunk/java/org/apache/coyote/http11/filters/VoidInputFilter.java
tomcat/trunk/webapps/docs/changelog.xml
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=1597649&r1=1597648&r2=1597649&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/filters/VoidInputFilter.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/filters/VoidInputFilter.java Mon
May 26 21:09:46 2014
@@ -47,12 +47,6 @@ public class VoidInputFilter implements
}
- // ----------------------------------------------------- Instance Variables
-
- // Tracks if an attempt has been made to read data
- private boolean read = false;
-
-
// ---------------------------------------------------- InputBuffer Methods
/**
@@ -62,7 +56,6 @@ public class VoidInputFilter implements
*/
@Override
public int doRead(ByteChunk chunk, Request req) throws IOException {
- read = true;
return -1;
}
@@ -92,7 +85,7 @@ public class VoidInputFilter implements
*/
@Override
public void recycle() {
- read = false;
+ // NOOP
}
@@ -123,16 +116,12 @@ public class VoidInputFilter implements
@Override
public int available() {
- if (read) {
- return 0;
- } else {
- return 1;
- }
+ return 0;
}
@Override
public boolean isFinished() {
- return read;
+ return true;
}
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1597649&r1=1597648&r2=1597649&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon May 26 21:09:46 2014
@@ -122,6 +122,10 @@
buffer when the buffer is only partially written on a subsequent write.
(markt)
</fix>
+ <fix>
+ Ensure that a request without a body is correctly handled during Comet
+ processing. This fixes the Comet chat example. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Jasper">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
