Fixes potential NullPointerException on shard closing #21515
Merged
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.
It was possible that in IndexService#closeShard(), an attempt
would be made to close the store where the store was not yet
initialized, throwing a NullPointerException. This commit
ensures that we do not call close on a store that has not
yet been initialized.
This was already fixed as part of #21084 which went into 6.0
and 5.x (see https://github.com/elastic/elasticsearch/pull/21084/files#diff-00f21a995130f7df8879749075287053R414), so this is a backport of this
particular NPE issue to 5.0.