Fixes #5521 ResourceCollection list NPE #5523
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
NPE check. Note that I cannot work out how the none directory resource was added in the first place, so I was unable to reproduce the exact exception.
|
@sbordet I'd really like to see some more debug from your test case, as I can't see how it was able to add a resource that does not exist. |
|
Ah! I've worked out how to reproduce. It can't be reproduced in 9, because we always check if resource exists and can return null. But in jetty-10, null is not a valid return for addPath, so even if resources to not exist, it uses a new constructor on ResourceCollection that also doesn't check to make a collection of non-existent resources. I will write code in 9.4 that is better structured and fix the 10 issues during the merge to 10. |
Refactor addPath in a simpler way, plus with TODOs to fix issues in 10 when merged.
Minimized changes in 9. Will do bulk of changes in 10.
Fix from review. remove duplicate line.
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.
Added null check for #5521.
Note that I cannot work out how the none directory resource was added in the first place, so I was unable to reproduce the exact exception.