Author: rjung
Date: Sat May 23 12:44:15 2015
New Revision: 1681341
URL: http://svn.apache.org/r1681341
Log:
Backport poller changes from trunk:
r1043696 | costin | 2010-12-08 22:45:05 +0100 (Wed, 08 Dec 2010) | 2 lines
Fix comment style, thanks Mladen.
r1043611 | costin | 2010-12-08 20:07:41 +0100 (Wed, 08 Dec 2010) | 6 lines
Javadoc for Poll.create() describes ENOTIMPL error if THREADSAFE is requested
but not supported.
The old code was silently removing THREADSAFE flag, java side wouldn't have any
way to know if it
needs to wait or can modify the poll set from a different thread.
Modified:
tomcat/native/branches/1.1.x/ (props changed)
tomcat/native/branches/1.1.x/native/src/poll.c
Propchange: tomcat/native/branches/1.1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat May 23 12:44:15 2015
@@ -1,3 +1,3 @@
-/tomcat/native/trunk:815411,988402,988428,992208,1205445,1295445,1342003,1342008,1342013,1342020,1342024,1394258,1394342,1424947,1424971,1430753,1437081,1438342,1439337,1441884,1441886,1442579,1442581,1445972,1507113,1532577,1532590,1539594,1555184,1559180,1588195,1607262,1607267,1607278,1607291,1607477,1648821,1650119,1650304,1658557,1658641-1658642,1658724,1669302,1669496,1681298,1681314,1681323
+/tomcat/native/trunk:815411,988402,988428,992208,1043611,1043696,1205445,1295445,1342003,1342008,1342013,1342020,1342024,1394258,1394342,1424947,1424971,1430753,1437081,1438342,1439337,1441884,1441886,1442579,1442581,1445972,1507113,1532577,1532590,1539594,1555184,1559180,1588195,1607262,1607267,1607278,1607291,1607477,1648821,1650119,1650304,1658557,1658641-1658642,1658724,1669302,1669496,1681298,1681314,1681323
/tomcat/tc7.0.x/trunk:1199985,1200164,1349932,1434887,1435769
/tomcat/trunk:815418,832198,1001939,1033916,1043103,1044729,1078522,1145209,1145285,1149092,1241356,1241406-1241407,1242254,1292671,1299980,1300102,1434905,1437083
Modified: tomcat/native/branches/1.1.x/native/src/poll.c
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/poll.c?rev=1681341&r1=1681340&r2=1681341&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/native/src/poll.c (original)
+++ tomcat/native/branches/1.1.x/native/src/poll.c Sat May 23 12:44:15 2015
@@ -109,9 +109,10 @@ TCN_IMPLEMENT_CALL(jlong, Poll, create)(
if (f & APR_POLLSET_THREADSAFE) {
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) {
+ /* Pass the ENOTIMPL to java, as described in javadocs. Java must
clean the
+ flag, will know it's not supported.
+ */
+ 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
