Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert rename of Response closeOutput to completeOutput #4693 

Revert the rename of this method and add a deprecated completeOutput to assist those that used the temporary rename.

Signed-off-by: Greg Wilkins <gregw@webtide.com>
This commit is contained in:
Greg Wilkins 2020-03-23 11:16:04 +01:00
parent 34488b71b6
commit d45fd14ef8
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -527,7 +527,7 @@ public class Response implements HttpServletResponse
resetBuffer(); resetBuffer();
setHeader(HttpHeader.LOCATION, location); setHeader(HttpHeader.LOCATION, location);
setStatus(code); setStatus(code);
completeOutput(); closeOutput();
} }
@Override @Override
@ -819,7 +819,7 @@ public class Response implements HttpServletResponse
{ {
try try
{ {
completeOutput(); closeOutput();
} }
catch (IOException e) catch (IOException e)
{ {
@ -857,7 +857,7 @@ public class Response implements HttpServletResponse
return (_contentLength < 0 || written >= _contentLength); return (_contentLength < 0 || written >= _contentLength);
} }
public void completeOutput() throws IOException public void closeOutput() throws IOException
{ {
if (_outputType == OutputType.WRITER) if (_outputType == OutputType.WRITER)
_writer.close(); _writer.close();
@ -865,6 +865,17 @@ public class Response implements HttpServletResponse
_out.close(); _out.close();
} }
/**
* close the output
*
* @deprecated Use {@link #closeOutput()}
*/
@Deprecated
public void completeOutput() throws IOException
{
closeOutput();
}
public void completeOutput(Callback callback) public void completeOutput(Callback callback)
{ {
if (_outputType == OutputType.WRITER) if (_outputType == OutputType.WRITER)