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.

Sign up for GitHub

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

Ensure completion handler is invoked on failure #32173

Merged
merged 1 commit into from
Aug 19, 2024
Merged

Ensure completion handler is invoked on failure #32173

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 19 additions & 5 deletions ...ainer-core/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletResponseController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,17 +247,31 @@ public ContentChannel handleResponse(Response response) {
private final ContentChannel responseContentChannel = new ContentChannel() {
@Override
public void write(ByteBuffer buf, CompletionHandler handler) {
commitResponseFromHandlerIfUncommitted(false);
out.writeBuffer(buf, handlerOrNoopHandler(handler));
var wrapped = handlerOrNoopHandler(handler);
try {
commitResponseFromHandlerIfUncommitted(false);
out.writeBuffer(buf, wrapped);
} catch (Throwable t) {
// In case any of the servlet API methods fails with exception
log.log(Level.FINE, "Failed to write buffer to output stream", t);
wrapped.failed(t);
}
}

@Override
public void close(CompletionHandler handler) {
commitResponseFromHandlerIfUncommitted(true);
out.close(handlerOrNoopHandler(handler));
var wrapped = handlerOrNoopHandler(handler);
try {
commitResponseFromHandlerIfUncommitted(true);
out.close(wrapped);
} catch (Throwable t) {
// In case any of the servlet API methods fails with exception
log.log(Level.FINE, "Failed to close output stream", t);
wrapped.failed(t);
}
}

private CompletionHandler handlerOrNoopHandler(CompletionHandler handler) {
private static CompletionHandler handlerOrNoopHandler(CompletionHandler handler) {
return handler != null ? handler : NOOP_COMPLETION_HANDLER;
}
};
Expand Down