Author: markt
Date: Thu Mar 12 10:31:47 2015
New Revision: 1666121
URL: http://svn.apache.org/r1666121
Log:
Add a registerforEvent() method to the SocketWrapper to aid back-porting some
APR fixes.
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/SocketWrapper.java
Modified: tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1666121&r1=1666120&r2=1666121&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Thu
Mar 12 10:31:47 2015
@@ -2469,5 +2469,11 @@ public class AprEndpoint extends Abstrac
endpoint.getPoller().close(getSocket().longValue());
}
}
+
+ @Override
+ public void registerforEvent(int timeout, boolean read, boolean write)
{
+ endpoint.getPoller().add(getSocket().longValue(), timeout,
+ (read ? Poll.APR_POLLIN : 0) | (write ? Poll.APR_POLLOUT :
0));
+ }
}
}
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/SocketWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/SocketWrapper.java?rev=1666121&r1=1666120&r2=1666121&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/SocketWrapper.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/SocketWrapper.java Thu
Mar 12 10:31:47 2015
@@ -165,4 +165,17 @@ public class SocketWrapper<E> {
public String toString() {
return super.toString() + ":" + String.valueOf(socket);
}
+
+
+ /**
+ * Register the associated socket for the requested events.
+ *
+ * @param timeout The time to wait for the event(s) to occur
+ * @param read Should the socket be register for read?
+ * @param write Should the socket be register for write?
+ */
+ public void registerforEvent(int timeout, boolean read, boolean write) {
+ // NO-OP by default.
+ // Currently only implemented by APR.
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
