Author: mturk
Date: Wed Aug 25 16:48:31 2010
New Revision: 989215
URL: http://svn.apache.org/viewvc?rev=989215&view=rev
Log:
Use the standard pollset_create API
Modified:
tomcat/native/trunk/native/src/poll.c
Modified: tomcat/native/trunk/native/src/poll.c
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/poll.c?rev=989215&r1=989214&r2=989215&view=diff
==============================================================================
--- tomcat/native/trunk/native/src/poll.c (original)
+++ tomcat/native/trunk/native/src/poll.c Wed Aug 25 16:48:31 2010
@@ -106,7 +106,7 @@ TCN_IMPLEMENT_CALL(jlong, Poll, create)(
apr_pollset_t *pollset = NULL;
tcn_pollset_t *tps = NULL;
apr_uint32_t f = (apr_uint32_t)flags;
- apr_pollset_method_e method = APR_POLLSET_DEFAULT;
+
UNREFERENCED(o);
TCN_ASSERT(pool != 0);
@@ -118,8 +118,8 @@ TCN_IMPLEMENT_CALL(jlong, Poll, create)(
f |= APR_POLLSET_WAKEABLE;
#endif
if (f & APR_POLLSET_THREADSAFE) {
- apr_status_t rv = apr_pollset_create_ex(&pollset, (apr_uint32_t)size,
- p, f, method);
+ apr_status_t rv = apr_pollset_create(&pollset, (apr_uint32_t)size,
+ p, f);
if (rv == APR_ENOTIMPL)
f &= ~APR_POLLSET_THREADSAFE;
else if (rv != APR_SUCCESS) {
@@ -128,8 +128,8 @@ TCN_IMPLEMENT_CALL(jlong, Poll, create)(
}
}
if (pollset == NULL) {
- apr_status_t rv = apr_pollset_create_ex(&pollset, (apr_uint32_t)size,
- p, f, method);
+ apr_status_t rv = apr_pollset_create(&pollset, (apr_uint32_t)size,
+ p, f);
#if defined(APR_POLLSET_WAKEABLE)
/* If case we fallback to select provider remove the
* APR_POLLSET_WAKEABLE which causes size + 1 elements
@@ -150,8 +150,8 @@ TCN_IMPLEMENT_CALL(jlong, Poll, create)(
}
#if defined(APR_POLLSET_WAKEABLE)
if (pollset == NULL) {
- apr_status_t rv = apr_pollset_create_ex(&pollset, (apr_uint32_t)size,
- p, f, method);
+ apr_status_t rv = apr_pollset_create(&pollset, (apr_uint32_t)size,
+ p, f);
if (rv != APR_SUCCESS) {
tcn_ThrowAPRException(e, rv);
goto cleanup;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
