diff options
| author | Greg Wilkins | 2012-07-05 10:38:42 +0000 |
|---|---|---|
| committer | Greg Wilkins | 2012-07-05 10:38:42 +0000 |
| commit | 88d92f584bab9e46aefb82aefa9c7f8966d3554f (patch) | |
| tree | 5e9f9e52f7129b3b7d511606220545a767fd6b4d | |
| parent | 5e619ce525994ee6d8227a45fefdff32974533ce (diff) | |
| download | org.eclipse.jetty.project-88d92f584bab9e46aefb82aefa9c7f8966d3554f.tar.gz org.eclipse.jetty.project-88d92f584bab9e46aefb82aefa9c7f8966d3554f.tar.xz org.eclipse.jetty.project-88d92f584bab9e46aefb82aefa9c7f8966d3554f.zip | |
384254 revert change to writable when not dispatched
| -rw-r--r-- | jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java b/jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java index a8db4ec100..3ba70b035b 100644 --- a/jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java +++ b/jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java @@ -333,9 +333,10 @@ public class SelectChannelEndPoint extends ChannelEndPoint implements AsyncEndPo if (l==0 && ( header!=null && header.hasContent() || buffer!=null && buffer.hasContent() || trailer!=null && trailer.hasContent())) { synchronized (this) - { - if (_dispatched) - _writable=false; + { + _writable=false; + if (!_dispatched) + updateKey(); } } else if (l>0) @@ -358,9 +359,10 @@ public class SelectChannelEndPoint extends ChannelEndPoint implements AsyncEndPo if (l==0 && buffer!=null && buffer.hasContent()) { synchronized (this) - { - if (_dispatched) - _writable=false; + { + _writable=false; + if (!_dispatched) + updateKey(); } } else if (l>0) |