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:31:07 UTC
svn commit: r1746500 - in /tomcat/trunk/java/org/apache/tomcat/util/net:
Nio2Endpoint.java NioEndpoint.java
Author: markt
Date: Wed Jun 1 21:31:07 2016
New Revision: 1746500
URL: http://svn.apache.org/viewvc?rev=1746500&view=rev
Log:
Align processSocket() implementations for NIO and NIO2.
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=1746500&r1=1746499&r2=1746500&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:31:07 2016
@@ -380,6 +380,9 @@ public class Nio2Endpoint extends Abstra
public boolean processSocket(SocketWrapperBase<Nio2Channel> socketWrapper,
SocketEvent event, boolean dispatch) {
try {
+ if (socketWrapper == null) {
+ return false;
+ }
SocketProcessor sc = processorCache.pop();
if (sc == null) {
sc = new SocketProcessor(socketWrapper, event);
@@ -393,7 +396,7 @@ public class Nio2Endpoint extends Abstra
sc.run();
}
} catch (RejectedExecutionException ree) {
- log.debug(sm.getString("endpoint.executor.fail", socketWrapper), ree);
+ log.warn(sm.getString("endpoint.executor.fail", socketWrapper), ree);
return false;
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
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=1746500&r1=1746499&r2=1746500&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:31:07 2016
@@ -441,8 +441,11 @@ public class NioEndpoint extends Abstrac
return false;
}
SocketProcessor sc = processorCache.pop();
- if ( sc == null ) sc = new SocketProcessor(socketWrapper, event);
- else sc.reset(socketWrapper, event);
+ if (sc == null) {
+ sc = new SocketProcessor(socketWrapper, event);
+ } else {
+ sc.reset(socketWrapper, event);
+ }
Executor executor = getExecutor();
if (dispatch && executor != null) {
executor.execute(sc);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org