Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue #3924 - Remove Resource.writeTo(OutputStream, long, long) #4558

Merged
merged 1 commit into from
Feb 11, 2020

Conversation

joakime
Copy link
Contributor

@joakime joakime commented Feb 7, 2020

Closes #3924

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
@joakime joakime marked this pull request as ready for review February 7, 2020 19:10
Copy link
Contributor

@lachlan-roberts lachlan-roberts left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@@ -669,18 +672,14 @@ protected boolean sendData(HttpServletRequest request,
if (include)
{
// write without headers
content.getResource().writeTo(out, 0, content_length);
writeContent(content, out, 0, content_length);
}
// else if we can't do a bypass write because of wrapping
else if (written || !(out instanceof HttpOutput))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nothing really to do with the changes but this line could be cleaned up, the value of !(out instanceof HttpOutput) is always false.

@joakime joakime merged commit a1c20b6 into jetty-10.0.x Feb 11, 2020
@joakime joakime deleted the jetty-10.0.x-3924-deprecate-resource-writeto branch February 11, 2020 20:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Deprecate Resource.writeTo(OutputStream, long, long)
3 participants