Author: markt
Date: Thu May 28 11:10:25 2015
New Revision: 1682206
URL: http://svn.apache.org/r1682206
Log:
Align release(SocketWrapper) for NIO and NIO2
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java?rev=1682206&r1=1682205&r2=1682206&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java Thu May
28 11:10:25 2015
@@ -73,14 +73,14 @@ public class Http11Nio2Protocol extends
}
/**
- * Expected to be used by the Poller to release resources on socket
+ * Expected to be used by the Endpoint to release resources on socket
* close, errors etc.
*/
@Override
- public void release(SocketWrapperBase<Nio2Channel> socket) {
- Nio2Channel channel = socket.getSocket();
- if (channel != null) {
- Processor processor = connections.remove(channel);
+ public void release(SocketWrapperBase<Nio2Channel> socketWrapper) {
+ Nio2Channel socket = socketWrapper.getSocket();
+ if (socket != null) {
+ Processor processor = connections.remove(socket);
if (processor != null) {
processor.recycle();
recycledProcessors.push(processor);
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java?rev=1682206&r1=1682205&r2=1682206&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java Thu May
28 11:10:25 2015
@@ -134,15 +134,18 @@ public class Http11NioProtocol extends A
}
/**
- * Expected to be used by the Poller to release resources on socket
+ * Expected to be used by the Endpoint to release resources on socket
* close, errors etc.
*/
@Override
- public void release(SocketWrapperBase<NioChannel> socket) {
- Processor processor = connections.remove(socket.getSocket());
- if (processor != null) {
- processor.recycle();
- recycledProcessors.push(processor);
+ public void release(SocketWrapperBase<NioChannel> socketWrapper) {
+ NioChannel socket = socketWrapper.getSocket();
+ if (socket != null) {
+ Processor processor = connections.remove(socket);
+ if (processor != null) {
+ processor.recycle();
+ recycledProcessors.push(processor);
+ }
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
