Fix NPE when updating settings on managed system indices #67200
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
`expectedValue` can be `null`, so using `Objects.equals` prevents an NPE here.
gwbrown
added
>non-issue
:Core/Infra/Core
|
Pinging @elastic/es-core-infra (Team:Core/Infra) |
|
I verified that this fixes the issue by reverting #67162 on a branch and applying this fix on top, then reproducing as described in #67147 (as the issue no longer reproduces with those commands when the |
pugnascotia
approved these changes
Jan 8, 2021
This was referenced Jan 11, 2021
gwbrown
added a commit
to gwbrown/elasticsearch
that referenced
this pull request
Jan 11, 2021
`expectedValue` can be `null` (and in fact will always be `null` if a key is in `requestedSettings` but not `descriptorSettings`), so using `Objects.equals` prevents an NPE here.
gwbrown
added a commit
to gwbrown/elasticsearch
that referenced
this pull request
Jan 11, 2021
`expectedValue` can be `null` (and in fact will always be `null` if a key is in `requestedSettings` but not `descriptorSettings`), so using `Objects.equals` prevents an NPE here.
gwbrown
added a commit
that referenced
this pull request
Jan 11, 2021
`expectedValue` can be `null` (and in fact will always be `null` if a key is in `requestedSettings` but not `descriptorSettings`), so using `Objects.equals` prevents an NPE here.
gwbrown
added a commit
that referenced
this pull request
Jan 11, 2021
`expectedValue` can be `null` (and in fact will always be `null` if a key is in `requestedSettings` but not `descriptorSettings`), so using `Objects.equals` prevents an NPE here.
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.
expectedValuecan benull(and in fact will always benullif a key is inrequestedSettingsbut notdescriptorSettings), so usingObjects.equalsprevents an NPE here.Relates #67147