From d45fd14ef83e99c8610b4c8a71ba40dd74c4592b Mon Sep 17 00:00:00 2001 From: Greg Wilkins Date: Mon, 23 Mar 2020 11:16:04 +0100 Subject: [PATCH] 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 --- .../java/org/eclipse/jetty/server/Response.java | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/Response.java b/jetty-server/src/main/java/org/eclipse/jetty/server/Response.java index cea9f830697..d2f265f77a6 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/Response.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/Response.java @@ -527,7 +527,7 @@ public class Response implements HttpServletResponse resetBuffer(); setHeader(HttpHeader.LOCATION, location); setStatus(code); - completeOutput(); + closeOutput(); } @Override @@ -819,7 +819,7 @@ public class Response implements HttpServletResponse { try { - completeOutput(); + closeOutput(); } catch (IOException e) { @@ -857,7 +857,7 @@ public class Response implements HttpServletResponse return (_contentLength < 0 || written >= _contentLength); } - public void completeOutput() throws IOException + public void closeOutput() throws IOException { if (_outputType == OutputType.WRITER) _writer.close(); @@ -865,6 +865,17 @@ public class Response implements HttpServletResponse _out.close(); } + /** + * close the output + * + * @deprecated Use {@link #closeOutput()} + */ + @Deprecated + public void completeOutput() throws IOException + { + closeOutput(); + } + public void completeOutput(Callback callback) { if (_outputType == OutputType.WRITER)