remm 2005/06/10 04:03:32
Modified: util/java/org/apache/tomcat/util/net AprEndpoint.java
Log:
- Use the new Status constants.
Revision Changes Path
1.38 +3 -3
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.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- AprEndpoint.java 27 May 2005 16:45:56 -0000 1.37
+++ AprEndpoint.java 10 Jun 2005 11:03:32 -0000 1.38
@@ -887,7 +887,7 @@
maintainTime += pollTime;
} else if (rv < 0) {
/* Any non timeup error is critical */
- if (Status.APR_STATUS_IS_TIMEUP(-rv))
+ if (-rv == Status.TIMEUP)
rv = 0;
else {
log.error(sm.getString("endpoint.poll.fail"));
@@ -1139,7 +1139,7 @@
long nw = Socket.sendfile(data.socket, data.fd, null,
null,
data.pos, data.end, 0);
if (nw < 0) {
- if (!Status.APR_STATUS_IS_EAGAIN((int) -nw)) {
+ if (!(-nw == Status.EAGAIN)) {
Poll.destroy(data.pool);
return false;
} else {
@@ -1275,7 +1275,7 @@
}
} else if (rv < 0) {
/* Any non timeup error is critical */
- if (Status.APR_STATUS_IS_TIMEUP(-rv))
+ if (-rv == Status.TIMEUP)
rv = 0;
else {
log.error(sm.getString("endpoint.poll.fail"));
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
