You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by mt...@apache.org on 2005/05/19 16:55:28 UTC
cvs commit: jakarta-tomcat-connectors/jni/native/src poll.c
mturk 2005/05/19 07:55:28
Modified: jni/native/src poll.c
Log:
Fix poll checking for error.
Revision Changes Path
1.13 +2 -2 jakarta-tomcat-connectors/jni/native/src/poll.c
Index: poll.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/src/poll.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- poll.c 23 Apr 2005 15:51:03 -0000 1.12
+++ poll.c 19 May 2005 14:55:28 -0000 1.13
@@ -157,7 +157,7 @@
if (rv != APR_SUCCESS)
return (jint)(-rv);
- if ((rv = apr_pollset_poll(p->pollset, J2T(timeout), &num, &fd) != APR_SUCCESS)) {
+ if ((rv = apr_pollset_poll(p->pollset, J2T(timeout), &num, &fd)) != APR_SUCCESS) {
num = (apr_int32_t)(-rv);
}
if (num > 0) {
@@ -207,7 +207,7 @@
memset(&fd, 0, sizeof(apr_pollfd_t));
for (i = 0; i < num; i++) {
fd.desc_type = APR_POLL_SOCKET;
- fd.desc.s = (apr_socket_t *)pset[i*4+1];
+ fd.desc.s = J2P(pset[i*4+1], apr_socket_t *);
do_remove(p, &fd);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org