Author: remm
Date: Tue Jul 21 13:18:30 2015
New Revision: 1692107
URL: http://svn.apache.org/r1692107
Log:
Continue cleaning up the accept algorithm.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java?rev=1692107&r1=1692106&r2=1692107&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Tue Jul 21
13:18:30 2015
@@ -341,7 +341,6 @@ public class Nio2Endpoint extends Abstra
// Process the connection
try {
socketProperties.setProperties(socket);
-
Nio2Channel channel = nioChannels.pop();
if (channel == null) {
SocketBufferHandler bufhandler = new SocketBufferHandler(
@@ -363,18 +362,13 @@ public class Nio2Endpoint extends Abstra
socketWrapper.setReadTimeout(getSoTimeout());
socketWrapper.setWriteTimeout(getSoTimeout());
// Continue processing on another thread
- processSocket(socketWrapper, SocketStatus.OPEN_READ, true);
+ return processSocket0(socketWrapper, SocketStatus.OPEN_READ, true);
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
- try {
- log.error("",t);
- } catch (Throwable tt) {
- ExceptionUtils.handleThrowable(t);
- }
- // Tell to close the socket
- return false;
+ log.error("",t);
}
- return true;
+ // Tell to close the socket
+ return false;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
