Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Wilkins2013-06-06 07:13:45 +0000
committerJoakim Erdfelt2013-06-17 16:19:02 +0000
commit5b60d42d3aeafe98ef77a60f59707760b04810f6 (patch)
tree7a28d73b3f5ee2cc83ed96d40feb588a8c1b2040
parentc22a8f195e99c9aef13d88258c56ba4e332cac8f (diff)
downloadorg.eclipse.jetty.project-5b60d42d3aeafe98ef77a60f59707760b04810f6.tar.gz
org.eclipse.jetty.project-5b60d42d3aeafe98ef77a60f59707760b04810f6.tar.xz
org.eclipse.jetty.project-5b60d42d3aeafe98ef77a60f59707760b04810f6.zip
409403 fix IllegalStateException when SPDY is used and the response is written through BufferUtil.writeTo byte by byte
Removed the clear from ChannelEndPoint#flush
-rw-r--r--jetty-io/src/main/java/org/eclipse/jetty/io/ChannelEndPoint.java16
1 files changed, 4 insertions, 12 deletions
diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/ChannelEndPoint.java b/jetty-io/src/main/java/org/eclipse/jetty/io/ChannelEndPoint.java
index 91d2ff330c..95480a5b3f 100644
--- a/jetty-io/src/main/java/org/eclipse/jetty/io/ChannelEndPoint.java
+++ b/jetty-io/src/main/java/org/eclipse/jetty/io/ChannelEndPoint.java
@@ -186,22 +186,14 @@ public class ChannelEndPoint extends AbstractEndPoint implements SocketBased
throw new EofException(e);
}
- boolean all_flushed=true;
if (flushed>0)
- {
notIdle();
- // clear empty buffers to prevent position creeping up the buffer
- for (ByteBuffer b : buffers)
- {
- if (BufferUtil.isEmpty(b))
- BufferUtil.clear(b);
- else
- all_flushed=false;
- }
- }
+ for (ByteBuffer b : buffers)
+ if (!BufferUtil.isEmpty(b))
+ return false;
- return all_flushed;
+ return true;
}
public ByteChannel getChannel()

Back to the top