[jbossweb-commits] JBossWeb SVN: r2437 - in branches/7.3.x: src/main/java/org/apache/tomcat/util/net and 1 other directory.
Author: aogburn
Date: 2014-06-02 15:40:15 -0400 (Mon, 02 Jun 2014)
New Revision: 2437
Modified:
branches/7.3.x/
branches/7.3.x/src/main/java/org/apache/tomcat/util/net/NioEndpoint.java
Log:
[BZ-1103891] merge fix to JBWEB-297 NIO concurrency issue
Property changes on: branches/7.3.x
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/7.4.x:2405
Modified: branches/7.3.x/src/main/java/org/apache/tomcat/util/net/NioEndpoint.java
===================================================================
--- branches/7.3.x/src/main/java/org/apache/tomcat/util/net/NioEndpoint.java 2014-06-02
19:20:34 UTC (rev 2436)
+++ branches/7.3.x/src/main/java/org/apache/tomcat/util/net/NioEndpoint.java 2014-06-02
19:40:15 UTC (rev 2437)
@@ -1031,8 +1031,14 @@
@Override
public void run() {
try {
- Handler.SocketState state = ((status == null) ? handler.process(channel) : handler
- .event(channel, status));
+ Handler.SocketState state = null;
+ if (status == null) {
+ state = handler.process(channel);
+ } else {
+ synchronized (channel) {
+ state = handler.event(channel, status);
+ }
+ }
if (state == SocketState.CLOSED) {
closeChannel(channel);
Property changes on:
branches/7.3.x/src/main/java/org/apache/tomcat/util/net/NioEndpoint.java
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/7.4.x/src/main/java/org/apache/tomcat/util/net/NioEndpoint.java:2407
+ /branches/7.4.x/src/main/java/org/apache/tomcat/util/net/NioEndpoint.java:2405,2407