You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by el...@apache.org on 2008/10/12 23:14:00 UTC
svn commit: r703877 -
/mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSocketAcceptor.java
Author: elecharny
Date: Sun Oct 12 14:13:59 2008
New Revision: 703877
URL: http://svn.apache.org/viewvc?rev=703877&view=rev
Log:
Replaced a magic number (-120001) by the associated constant.
Added some comments
Modified:
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSocketAcceptor.java
Modified: mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSocketAcceptor.java
URL: http://svn.apache.org/viewvc/mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSocketAcceptor.java?rev=703877&r1=703876&r2=703877&view=diff
==============================================================================
--- mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSocketAcceptor.java (original)
+++ mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSocketAcceptor.java Sun Oct 12 14:13:59 2008
@@ -47,6 +47,11 @@
* @version $Rev$, $Date$
*/
public final class AprSocketAcceptor extends AbstractPollingIoAcceptor<AprSession, Long> implements SocketAcceptor {
+ /**
+ * This constant is deduced from the APR code. It is used when the timeout
+ * has expired while doing a poll() operation.
+ */
+ private static final int APR_TIMEUP_ERROR = -120001;
private static final int POLLSET_SIZE = 1024;
@@ -213,7 +218,10 @@
protected boolean select() throws Exception {
int rv = Poll.poll(pollset, Integer.MAX_VALUE, polledSockets, false);
if (rv <= 0) {
- if (rv != -120001) {
+ // We have had an error. It can simply be that we have reached
+ // the timeout (very unlikely, as we have set it to MAX_INTEGER)
+ if (rv != APR_TIMEUP_ERROR) {
+ // It's not a timeout being exceeded. Throw the error
throwException(rv);
}