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 11:37:51 UTC
svn commit: r1772870 - in /tomcat/trunk/java/org/apache/tomcat/util/net:
Nio2Endpoint.java NioEndpoint.java
Author: markt
Date: Tue Dec 6 11:37:51 2016
New Revision: 1772870
URL: http://svn.apache.org/viewvc?rev=1772870&view=rev
Log:
Refactor to better align NIO and NIO2 Acceptor classes
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=1772870&r1=1772869&r2=1772870&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 11:37:51 2016
@@ -430,6 +430,7 @@ public class Nio2Endpoint extends Abstra
// socket
socket = serverSock.accept().get();
} catch (Exception e) {
+ // We didn't get a socket
countDownConnection();
if (running) {
// Introduce delay if necessary
@@ -448,24 +449,11 @@ public class Nio2Endpoint extends Abstra
// Hand this socket off to an appropriate processor
if (!setSocketOptions(socket)) {
countDownConnection();
- try {
- socket.close();
- } catch (IOException ioe) {
- if (log.isDebugEnabled()) {
- log.debug("", ioe);
- }
- }
+ closeSocket(socket);
}
} else {
countDownConnection();
- // Close socket right away
- try {
- socket.close();
- } catch (IOException ioe) {
- if (log.isDebugEnabled()) {
- log.debug("", ioe);
- }
- }
+ closeSocket(socket);
}
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
@@ -475,6 +463,16 @@ public class Nio2Endpoint extends Abstra
state = AcceptorState.ENDED;
}
+
+ private void closeSocket(AsynchronousSocketChannel socket) {
+ try {
+ socket.close();
+ } catch (IOException ioe) {
+ if (log.isDebugEnabled()) {
+ log.debug(sm.getString("endpoint.err.close"), 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=1772870&r1=1772869&r2=1772870&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 11:37:51 2016
@@ -443,7 +443,7 @@ public class NioEndpoint extends Abstrac
// socket
socket = serverSock.accept();
} catch (IOException ioe) {
- //we didn't get a socket
+ // We didn't get a socket
countDownConnection();
// Introduce delay if necessary
errorDelay = handleExceptionWithDelay(errorDelay);
@@ -477,6 +477,24 @@ public class NioEndpoint extends Abstrac
}
state = AcceptorState.ENDED;
}
+
+
+ private void closeSocket(SocketChannel socket) {
+ try {
+ socket.socket().close();
+ } catch (IOException ioe) {
+ if (log.isDebugEnabled()) {
+ log.debug(sm.getString("endpoint.err.close"), ioe);
+ }
+ }
+ try {
+ socket.close();
+ } catch (IOException ioe) {
+ if (log.isDebugEnabled()) {
+ log.debug(sm.getString("endpoint.err.close"), ioe);
+ }
+ }
+ }
}
@@ -507,24 +525,6 @@ public class NioEndpoint extends Abstrac
}
}
- private void closeSocket(SocketChannel socket) {
- try {
- socket.socket().close();
- } catch (IOException ioe) {
- if (log.isDebugEnabled()) {
- log.debug("", ioe);
- }
- }
- try {
- socket.close();
- } catch (IOException ioe) {
- if (log.isDebugEnabled()) {
- log.debug("", ioe);
- }
- }
- }
-
-
// ----------------------------------------------------- Poller Inner Classes
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org