Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-03-03 20:39:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jetty-9.3.x'

Browse Source
This commit is contained in:
Joakim Erdfelt 2016-03-02 09:08:30 -07:00
commit eba2bffefe
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
View File

@ -761,7 +761,7 @@ public class HttpOutput extends ServletOutputStream implements Runnable
} }
if (_channel.isCommitted()) if (_channel.isCommitted())
{ {
callback.failed(new IOException("committed")); callback.failed(new IOException("cannot sendContent(), output already committed"));
return; return;
} }

4
jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
View File

@ -1091,7 +1091,7 @@ public class Response implements HttpServletResponse
public void setBufferSize(int size) public void setBufferSize(int size)
{ {
if (isCommitted() || getContentCount() > 0) if (isCommitted() || getContentCount() > 0)
throw new IllegalStateException("Committed or content written"); throw new IllegalStateException("cannot set buffer size on committed response");
if (size <= 0) if (size <= 0)
size = __MIN_BUFFER_SIZE; size = __MIN_BUFFER_SIZE;
_out.setBufferSize(size); _out.setBufferSize(size);
@ -1175,7 +1175,7 @@ public class Response implements HttpServletResponse
public void resetBuffer() public void resetBuffer()
{ {
if (isCommitted()) if (isCommitted())
throw new IllegalStateException("Committed"); throw new IllegalStateException("cannot reset buffer on committed response");
_out.resetBuffer(); _out.resetBuffer();
} }