Author: markt
Date: Thu Mar 12 10:03:28 2015
New Revision: 1666116
URL: http://svn.apache.org/r1666116
Log:
Simplify
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=1666116&r1=1666115&r2=1666116&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Thu Mar 12
10:03:28 2015
@@ -1467,15 +1467,9 @@ public class AprEndpoint extends Abstrac
*
* @param socket to add to the poller
* @param timeout to use for this connection
- * @param read to do read polling
- * @param write to do write polling
+ * @param flags Events to poll for (Poll.APR_POLLIN and/or
+ * Poll.APR_POLLOUT)
*/
- private void add(long socket, int timeout, boolean read, boolean
write) {
- add(socket, timeout,
- (read ? Poll.APR_POLLIN : 0) |
- (write ? Poll.APR_POLLOUT : 0));
- }
-
private void add(long socket, int timeout, int flags) {
if (log.isDebugEnabled()) {
String msg = sm.getString("endpoint.debug.pollerAdd",
@@ -2219,7 +2213,7 @@ public class AprEndpoint extends Abstrac
// poller for processing of further
requests
getPoller().add(
state.socket,
getKeepAliveTimeout(),
- true, false);
+ Poll.APR_POLLIN);
} else {
// Close the socket since this is
// the end of not keep-alive request.
@@ -2303,7 +2297,7 @@ public class AprEndpoint extends Abstrac
if (!deferAccept) {
if (setSocketOptions(socket.getSocket().longValue())) {
getPoller().add(socket.getSocket().longValue(),
- getSoTimeout(), true, false);
+ getSoTimeout(), Poll.APR_POLLIN);
} else {
// Close socket and pool
closeSocket(socket.getSocket().longValue());
@@ -2697,7 +2691,7 @@ public class AprEndpoint extends Abstrac
return;
}
((AprEndpoint) getEndpoint()).getPoller().add(
- getSocket().longValue(), -1, true, false);
+ getSocket().longValue(), -1, Poll.APR_POLLIN);
}
}
@@ -2710,7 +2704,7 @@ public class AprEndpoint extends Abstrac
return;
}
((AprEndpoint) getEndpoint()).getPoller().add(
- getSocket().longValue(), -1, false, true);
+ getSocket().longValue(), -1, Poll.APR_POLLOUT);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
