You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2016/12/06 12:39:29 UTC
svn commit: r1772881 - in /tomcat/trunk/java/org/apache/tomcat/util/net:
Nio2Endpoint.java NioEndpoint.java
Author: markt
Date: Tue Dec 6 12:39:29 2016
New Revision: 1772881
URL: http://svn.apache.org/viewvc?rev=1772881&view=rev
Log:
Refactor
- reduce duplication
- better alignment with APR
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.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=1772881&r1=1772880&r2=1772881&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Tue Dec 6 12:39:29 2016
@@ -449,11 +449,9 @@ public class Nio2Endpoint extends Abstra
// setSocketOptions() will hand the socket off to
// an appropriate processor if successful
if (!setSocketOptions(socket)) {
- countDownConnection();
closeSocket(socket);
}
} else {
- countDownConnection();
closeSocket(socket);
}
} catch (Throwable t) {
@@ -466,6 +464,7 @@ public class Nio2Endpoint extends Abstra
private void closeSocket(AsynchronousSocketChannel socket) {
+ countDownConnection();
try {
socket.close();
} catch (IOException ioe) {
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1772881&r1=1772880&r2=1772881&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Tue Dec 6 12:39:29 2016
@@ -461,11 +461,9 @@ public class NioEndpoint extends Abstrac
// setSocketOptions() will hand the socket off to
// an appropriate processor if successful
if (!setSocketOptions(socket)) {
- countDownConnection();
closeSocket(socket);
}
} else {
- countDownConnection();
closeSocket(socket);
}
} catch (Throwable t) {
@@ -478,6 +476,7 @@ public class NioEndpoint extends Abstrac
private void closeSocket(SocketChannel socket) {
+ countDownConnection();
try {
socket.socket().close();
} catch (IOException ioe) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org