Issue #12725 reset match indexes for FilterMappings on setFilterMappings #12734
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
kshep92
reviewed
Jan 27, 2025
| @@ -1395,6 +1395,8 @@ public void setFilterMappings(FilterMapping[] filterMappings) | |||
| if (isRunning()) | |||
| updateMappings(); | |||
| invalidateChainsCache(); | |||
| _matchBeforeIndex = -1; | |||
There was a problem hiding this comment.
Further up in the code, there's this line: List<FilterMapping> mappings = filterMappings == null ? Collections.emptyList() : Arrays.asList(filterMappings); With that being the case, do we always want to reset the indexes to -1 or would we want to determine the correct indexes by looking at the size of the mappings list?
There was a problem hiding this comment.
@kshep92 currently addFilterMapping(FilterMapping) handles all of the calculation of the indexes - if nobody calls this method, then the values of the index are kind of moot.
gregw
approved these changes
Feb 1, 2025
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 is an alternative fix for PR #12725.
When a user calls
ServletHandler.setFilterMappings(FilterMapping[])this is like a reset of anyFilterMappingsthat may have existed previously, either by a previous call to the same method, or importantly via a call toaddFilterMapping(FilterMapping). WhenaddFilterMapping(FilterMapping)is called, we need to calculate where it should be added, as the servlet spec allows for pre or postpending to existingFilterMappings. We maintain 2 indexes_matchBeforeIndexand_matchAfterIndexto help us determine where to insert the addedFilterMapping.As
setFilterMappings([FilterMapping[])is essentially a reset, these 2 indexes need to be reset too.