SOLR-17088: Fix custom solr.xml usage in tests with extra jettys #2437
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
cpoerschke
reviewed
May 3, 2024
| @@ -276,6 +277,7 @@ public MiniSolrCloudCluster( | |||
| Objects.requireNonNull(securityJson); | |||
| this.baseDir = Objects.requireNonNull(baseDir); | |||
| this.jettyConfig = Objects.requireNonNull(jettyConfig); | |||
| this.solrXml = solrXml == null ? DEFAULT_CLOUD_SOLR_XML : solrXml; | |||
There was a problem hiding this comment.
Wondering if the similar logic at lines 491-493/492-494 can be removed now then?
edit: or rather not removed but amended i.e. use passed in solrXml if non-null and this.solrXml otherwise
There was a problem hiding this comment.
Yeah, I didn't see the other usages of this method with null. So I moved the defaulting here instead. Thanks for the review!
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.
https://issues.apache.org/jira/browse/SOLR-17088