Issue #6654 - Fix NPEs from bad Servlet API use #6655
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
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
joakime
commented
Aug 23, 2021
| @@ -135,10 +140,13 @@ public int getHeaderInt(String name) | |||
| { | |||
| Map<String, List<String>> headers = new TreeMap<>(String.CASE_INSENSITIVE_ORDER); | |||
| Enumeration<String> headerNames = request.getHeaderNames(); | |||
| while (headerNames.hasMoreElements()) | |||
| if (headerNames != null) | |||
There was a problem hiding this comment.
The servlet spec indicates that this can also be null.
Jetty 10.0.7/11.0.7 FROZEN
automation
moved this from In progress
to Review in progress
Aug 23, 2021
sbordet
requested changes
Aug 23, 2021
...-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/ServerUpgradeRequest.java
Show resolved
Hide resolved
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
sbordet
previously approved these changes
Aug 23, 2021
Jetty 10.0.7/11.0.7 FROZEN
automation
moved this from Review in progress
to Reviewer approved
Aug 23, 2021
| } | ||
| else | ||
| { | ||
| cookies = List.of(); |
There was a problem hiding this comment.
Shouldn't we also return null here if the request had no cookies?
There was a problem hiding this comment.
We had this discussion already recently and determined that emptyList was both more readable and more effficient.
Suggested change
| cookies = List.of(); | |
| cookies = Collections.emptyList(); |
gregw
previously requested changes
Aug 24, 2021
| } | ||
| else | ||
| { | ||
| cookies = List.of(); |
There was a problem hiding this comment.
We had this discussion already recently and determined that emptyList was both more readable and more effficient.
Suggested change
| cookies = List.of(); | |
| cookies = Collections.emptyList(); |
Jetty 10.0.7/11.0.7 FROZEN
automation
moved this from Reviewer approved
to Review in progress
Aug 24, 2021
The call to |
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Jetty 10.0.7/11.0.7 FROZEN
automation
moved this from Review in progress
to Reviewer approved
Aug 25, 2021
sbordet
approved these changes
Aug 25, 2021
joakime
deleted the
jetty-10.0.x-6654-websocket-upgrade-npe-request-cookies
branch
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.
Signed-off-by: Joakim Erdfelt joakim.erdfelt@gmail.com