remm 2005/06/10 07:36:18
Modified: util/java/org/apache/tomcat/util/net AprEndpoint.java
http11/src/java/org/apache/coyote/http11
InternalAprInputBuffer.java
Log:
- Update after change of the status codes used.
Revision Changes Path
1.41 +1 -1
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/AprEndpoint.java
Index: AprEndpoint.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/AprEndpoint.java,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- AprEndpoint.java 10 Jun 2005 12:55:12 -0000 1.40
+++ AprEndpoint.java 10 Jun 2005 14:36:18 -0000 1.41
@@ -1217,7 +1217,7 @@
// Add socket to the poller
if (addS.size() > 0) {
synchronized (addS) {
- for (int i = addS.size() - 1; i >= 0; i--) {
+ for (int i = (addS.size() - 1); i >= 0; i--) {
SendfileData data = (SendfileData)
addS.get(i);
int rv = Poll.add(sendfilePollset,
data.socket, 0, Poll.APR_POLLOUT);
if (rv == Status.APR_SUCCESS) {
1.8 +3 -3
jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/InternalAprInputBuffer.java
Index: InternalAprInputBuffer.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/InternalAprInputBuffer.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- InternalAprInputBuffer.java 25 May 2005 12:45:38 -0000 1.7
+++ InternalAprInputBuffer.java 10 Jun 2005 14:36:18 -0000 1.8
@@ -412,7 +412,7 @@
bbuf.get(buf, pos, nRead);
lastValid = pos + nRead;
} else {
- if (Status.APR_STATUS_IS_ETIMEDOUT(-nRead)) {
+ if ((-nRead) == Status.ETIMEDOUT || (-nRead) ==
Status.TIMEUP) {
return false;
} else {
throw new
IOException(sm.getString("iib.failedread"));
@@ -442,7 +442,7 @@
bbuf.get(buf, pos, nRead);
lastValid = pos + nRead;
} else {
- if (Status.APR_STATUS_IS_ETIMEDOUT(-nRead)) {
+ if ((-nRead) == Status.ETIMEDOUT || (-nRead) ==
Status.TIMEUP) {
return false;
} else {
throw new IOException(sm.getString("iib.failedread"));
@@ -786,7 +786,7 @@
bbuf.get(buf, pos, nRead);
lastValid = pos + nRead;
} else {
- if (Status.APR_STATUS_IS_EAGAIN(-nRead)) {
+ if ((-nRead) == Status.EAGAIN) {
return false;
} else {
throw new IOException(sm.getString("iib.failedread"));
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
