Author: markt
Date: Wed May 22 23:13:56 2013
New Revision: 1485495
URL: http://svn.apache.org/r1485495
Log:
Revert r1485489 - wrong file commited
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1485495&r1=1485494&r2=1485495&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Wed May 22
23:13:56 2013
@@ -1602,14 +1602,12 @@ public class AprEndpoint extends Abstrac
log.debug("Poller run() adding socket: " +
info.socket);
}
+ removeFromPoller(info.socket);
timeouts.remove(info.socket);
if (info.read() || info.write()) {
AprSocketWrapper wrapper = connections.get(
Long.valueOf(info.socket));
boolean comet = wrapper.isComet();
- if (comet || wrapper.pollerFlags != 0) {
- removeFromPoller(info.socket);
- }
wrapper.pollerFlags = wrapper.pollerFlags |
(info.read() ? Poll.APR_POLLIN : 0) |
(info.write() ? Poll.APR_POLLOUT : 0);
@@ -1651,11 +1649,6 @@ public class AprEndpoint extends Abstrac
pollerSpace[i] += rv;
connectionCount -= rv;
for (int n = 0; n < rv; n++) {
- if (log.isDebugEnabled()) {
- log.debug("Poller run() poll() of socket "
+
- desc[n*2+1] + " with flags " +
- desc[n*2]);
- }
timeouts.remove(desc[n*2+1]);
AprSocketWrapper wrapper = connections.get(
Long.valueOf(desc[n*2+1]));
@@ -1672,7 +1665,7 @@ public class AprEndpoint extends Abstrac
}
} else if ((desc[n*2] & Poll.APR_POLLIN)
== Poll.APR_POLLIN) {
if (wrapper.pollerFlags != 0) {
- add(desc[n*2+1], 0,
wrapper.pollerFlags);
+ add(desc[n*2+1], 1,
wrapper.pollerFlags);
}
if (!processSocket(desc[n*2+1],
SocketStatus.OPEN_READ)) {
// Close socket and clear pool
@@ -1680,7 +1673,7 @@ public class AprEndpoint extends Abstrac
}
} else if ((desc[n*2] & Poll.APR_POLLOUT)
== Poll.APR_POLLOUT) {
if (wrapper.pollerFlags != 0) {
- add(desc[n*2+1], 0,
wrapper.pollerFlags);
+ add(desc[n*2+1], 1,
wrapper.pollerFlags);
}
if (!processSocket(desc[n*2+1],
SocketStatus.OPEN_WRITE)) {
// Close socket and clear pool
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
