Author: fhanik
Date: Tue May 29 09:46:23 2007
New Revision: 542586
URL: http://svn.apache.org/viewvc?view=rev&rev=542586
Log:
adopted changes
Modified:
tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java
tomcat/trunk/java/org/apache/catalina/connector/Request.java
tomcat/trunk/java/org/apache/catalina/connector/Response.java
tomcat/trunk/java/org/apache/coyote/Response.java
Modified: tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java?view=diff&rev=542586&r1=542585&r2=542586
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java Tue May
29 09:46:23 2007
@@ -207,7 +207,7 @@
}
if (response.isClosed() || !request.isComet()) {
res.action(ActionCode.ACTION_COMET_END, null);
- } else if (!error && read && request.getAvailable()) {
+ } else if (!error && read && request.isReadable()) {
// If this was a read and not all bytes have been read, or
if no data
// was read from the connector, then it is an error
error = true;
@@ -292,7 +292,7 @@
if (request.isComet()) {
if (!response.isClosed() && !response.isError()) {
- if (request.getAvailable()) {
+ if (request.isReadable()) {
// Invoke a read event right away if there are
available bytes
if (event(req, res, SocketStatus.OPEN_READ)) {
comet = true;
Modified: tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java?view=diff&rev=542586&r1=542585&r2=542586
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java Tue May
29 09:46:23 2007
@@ -323,6 +323,14 @@
}
+
+ /**
+ * Return the amount of bytes written by the lower layer.
+ */
+ protected int lastWrite() {
+ return coyoteResponse.getLastWrite();
+ }
+
// ------------------------------------------------- Bytes Handling Methods
Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?view=diff&rev=542586&r1=542585&r2=542586
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Tue May 29
09:46:23 2007
@@ -2252,7 +2252,7 @@
/**
* Return true if bytes are available.
*/
- public boolean getAvailable() {
+ public boolean isReadable() {
return (inputBuffer.available() > 0);
}
Modified: tomcat/trunk/java/org/apache/catalina/connector/Response.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Response.java?view=diff&rev=542586&r1=542585&r2=542586
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/Response.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Response.java Tue May 29
09:46:23 2007
@@ -529,6 +529,14 @@
}
+ /**
+ * Return true if bytes are available.
+ */
+ public boolean isWriteable() {
+ return (outputBuffer.lastWrite() > 0);
+ }
+
+
// ------------------------------------------------ ServletResponse Methods
Modified: tomcat/trunk/java/org/apache/coyote/Response.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/Response.java?view=diff&rev=542586&r1=542585&r2=542586
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/Response.java (original)
+++ tomcat/trunk/java/org/apache/coyote/Response.java Tue May 29 09:46:23 2007
@@ -124,6 +124,8 @@
protected Request req;
+ protected int lastWrite = 1;
+
// ------------------------------------------------------------- Properties
public Request getRequest() {
@@ -188,6 +190,16 @@
// -------------------- State --------------------
+ public int getLastWrite() {
+ return lastWrite;
+ }
+
+
+ public void setLastWrite(int lastWrite) {
+ this.lastWrite = lastWrite;
+ }
+
+
public int getStatus() {
return status;
}
@@ -579,6 +591,7 @@
headers.clear();
// update counters
+ lastWrite = 1;
bytesWritten=0;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
