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/06/01 21:17:19 UTC
svn commit: r1746496 - in /tomcat/trunk/java/org/apache/tomcat/util/net:
Nio2Endpoint.java NioEndpoint.java
Author: markt
Date: Wed Jun 1 21:17:18 2016
New Revision: 1746496
URL: http://svn.apache.org/viewvc?rev=1746496&view=rev
Log:
Merge duplicate methods.
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=1746496&r1=1746495&r2=1746496&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Wed Jun 1 21:17:18 2016
@@ -358,7 +358,7 @@ public class Nio2Endpoint extends Abstra
socketWrapper.setReadTimeout(getSoTimeout());
socketWrapper.setWriteTimeout(getSoTimeout());
// Continue processing on another thread
- return processSocket0(socketWrapper, SocketEvent.OPEN_READ, true);
+ return processSocket(socketWrapper, SocketEvent.OPEN_READ, true);
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
log.error("",t);
@@ -378,17 +378,13 @@ public class Nio2Endpoint extends Abstra
@Override
public boolean processSocket(SocketWrapperBase<Nio2Channel> socketWrapper,
- SocketEvent socketStatus, boolean dispatch) {
- return processSocket0(socketWrapper, socketStatus, dispatch);
- }
-
- protected boolean processSocket0(SocketWrapperBase<Nio2Channel> socketWrapper, SocketEvent status, boolean dispatch) {
+ SocketEvent event, boolean dispatch) {
try {
SocketProcessor sc = processorCache.pop();
if (sc == null) {
- sc = new SocketProcessor(socketWrapper, status);
+ sc = new SocketProcessor(socketWrapper, event);
} else {
- sc.reset(socketWrapper, status);
+ sc.reset(socketWrapper, event);
}
Executor executor = getExecutor();
if (dispatch && executor != null) {
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=1746496&r1=1746495&r2=1746496&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Wed Jun 1 21:17:18 2016
@@ -436,10 +436,6 @@ public class NioEndpoint extends Abstrac
@Override
public boolean processSocket(SocketWrapperBase<NioChannel> socketWrapper,
SocketEvent event, boolean dispatch) {
- return processSocket((NioSocketWrapper) socketWrapper, event, dispatch);
- }
-
- protected boolean processSocket(NioSocketWrapper socketWrapper, SocketEvent event, boolean dispatch) {
try {
if (socketWrapper == null) {
return false;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org