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

Jump to bottom

Fix incorrect call to super in BufferedResponseHandler #10613

Merged
merged 1 commit into from
Sep 28, 2023
Merged

Fix incorrect call to super in BufferedResponseHandler #10613

Show file tree
Hide file tree
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
3 changes: 2 additions & 1 deletion jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,8 @@ public void setDefaultHandler(Handler defaultHandler)
public boolean handle(Request request, Response response, Callback callback) throws Exception
{
// Handle either with normal handler or default handler
return super.handle(request, response, callback) || _defaultHandler != null && _defaultHandler.handle(request, response, callback);
Handler next = getHandler();
return next != null && next.handle(request, response, callback) || _defaultHandler != null && _defaultHandler.handle(request, response, callback);
}

public String getServerInfo()
Expand Down
4 changes: 2 additions & 2 deletions .../jetty-server/src/main/java/org/eclipse/jetty/server/handler/BufferedResponseHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,8 @@ public boolean onConditionsMet(Request request, Response response, Callback call
if (LOG.isDebugEnabled())
LOG.debug("{} excluded by path suffix mime type {}", this, request);

// handle normally
return super.handle(request, response, callback);
// handle without buffering
return next.handle(request, response, callback);
Copy link
Contributor

Choose a reason for hiding this comment

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

Good catch!

}
}

Expand Down