[jbossweb-commits] JBossWeb SVN: r2411 - branches/JBOSSWEB_7_2_2_FINAL_BZ-1093718/src/main/java/org/apache/tomcat/util/net.
Author: aogburn
Date: 2014-05-02 10:10:48 -0400 (Fri, 02 May 2014)
New Revision: 2411
Modified:
branches/JBOSSWEB_7_2_2_FINAL_BZ-1093718/src/main/java/org/apache/tomcat/util/net/NioEndpoint.java
Log:
[BZ-1093718] commit merged fix
Modified:
branches/JBOSSWEB_7_2_2_FINAL_BZ-1093718/src/main/java/org/apache/tomcat/util/net/NioEndpoint.java
===================================================================
---
branches/JBOSSWEB_7_2_2_FINAL_BZ-1093718/src/main/java/org/apache/tomcat/util/net/NioEndpoint.java 2014-05-02
13:03:49 UTC (rev 2410)
+++
branches/JBOSSWEB_7_2_2_FINAL_BZ-1093718/src/main/java/org/apache/tomcat/util/net/NioEndpoint.java 2014-05-02
14:10:48 UTC (rev 2411)
@@ -1028,8 +1028,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/JBOSSWEB_7_2_2_FINAL_BZ-1093718/src/main/java/org/apache/tomcat/util/net/NioEndpoint.java
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/7.4.x/src/main/java/org/apache/tomcat/util/net/NioEndpoint.java:2405