[jbossweb-commits] JBossWeb SVN: r1277 - in trunk/java/org/apache/tomcat/util/net: res and 1 other directory.

Author: remy.maucherat(a)jboss.com Date: 2009-11-19 14:01:33 -0500 (Thu, 19 Nov 2009) New Revision: 1277 Modified: trunk/java/org/apache/tomcat/util/net/AprEndpoint.java trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties Log: - It is safer to add a big catch all here, as falling off without cleaning up a bit can be disastrous. Modified: trunk/java/org/apache/tomcat/util/net/AprEndpoint.java =================================================================== --- trunk/java/org/apache/tomcat/util/net/AprEndpoint.java 2009-11-19 03:02:03 UTC (rev 1276) +++ trunk/java/org/apache/tomcat/util/net/AprEndpoint.java 2009-11-19 19:01:33 UTC (rev 1277) @@ -1774,6 +1774,13 @@ // Close socket and clear pool Socket.destroy(desc[n*2+1]); } + } else { + // Unknown event + log.warn(sm.getString("endpoint.poll.flags", "" + desc[n*2])); + if (!processSocket(desc[n*2+1], SocketStatus.ERROR)) { + // Close socket and clear pool + Socket.destroy(desc[n*2+1]); + } } } else if (((desc[n*2] & Poll.APR_POLLHUP) == Poll.APR_POLLHUP) || ((desc[n*2] & Poll.APR_POLLERR) == Poll.APR_POLLERR)) { Modified: trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties =================================================================== --- trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties 2009-11-19 03:02:03 UTC (rev 1276) +++ trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties 2009-11-19 19:01:33 UTC (rev 1277) @@ -19,6 +19,7 @@ endpoint.poll.limitedpollsize=Failed to create poller with specified size of {0} endpoint.poll.initfail=Poller creation failed endpoint.poll.fail=Critical poller failure (restarting poller): [{0}] {1} +endpoint.poll.flags=Unfiltered poll flag {0}, sending error endpoint.poll.error=Unexpected poller error endpoint.maintain.error=Error processing timeouts endpoint.process.fail=Error allocating socket processor