Jetty 12.1.x tck error message #12011
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
janbartel
added
the
TCK
gregw
requested changes
Jul 8, 2024
| @@ -73,6 +73,14 @@ public boolean errorPageForMethod(String method) | |||
| }; | |||
| } | |||
|
|
|||
| private static Object getRequestErrorAttribute(HttpServletRequest request, String servletApiName, String jettyName) | |||
There was a problem hiding this comment.
Why is this method necessary?
I thought the policy was that we would always set the jetty(core) attribute and then any request wrapper used for an error dispatch to a filter/servlet would intercept the servlet attributes and lookup the jetty ones
So our code should then only ever need to lookup jetty(core) attributes? Unless there is a case where an application sets them and we are expected to act on them?
There was a problem hiding this comment.
That is part of the refactoring effort, which is a much wider scope than just satisfying the tck.
| { | ||
| Object o = request.getAttribute(servletApiName); | ||
| if (o == null) | ||
| o = request.getAttribute(jettyName); |
There was a problem hiding this comment.
Suggested change
| o = request.getAttribute(jettyName); | |
| o = request.getAttribute(coreAttributeName); |
| @@ -73,6 +73,14 @@ public boolean errorPageForMethod(String method) | |||
| }; | |||
| } | |||
|
|
|||
| private static Object getRequestErrorAttribute(HttpServletRequest request, String servletApiName, String jettyName) | |||
| { | |||
| Object o = request.getAttribute(servletApiName); | |||
There was a problem hiding this comment.
Suggested change
| Object o = request.getAttribute(servletApiName); | |
| Object o = request.getAttribute(servletAttributeName); |
gregw
approved these changes
Jul 8, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR fixes the output of ErrorHandler in accordance with TCK expectations. See #11931 (comment).
There is also a branch for entirely refactoring the servlet api
ErrorHandler(https://github.com/jetty/jetty.project/tree/jetty-12.1.x-refactor-servlet-error-handler) however that is orthogonal to this fix.