This is an automated email from the ASF dual-hosted git repository. dsmiley pushed a commit to branch branch_9x in repository https://gitbox.apache.org/repos/asf/solr.git
commit 4758b88be3b7ed4f14b5409d62e0bbfe96936ccc Author: David Smiley <[email protected]> AuthorDate: Fri Nov 28 01:15:12 2025 -0500 Tests: SolrJettyTestRule: harden cleanup If we don't insist `jetty` get removed, then one test failure of jetty not stopping can lead to follow-on tests failing as they can't start (cherry picked from commit 05c15e8db7372639fa3cb2e650366eec0acfe41a) --- .../src/java/org/apache/solr/util/SolrJettyTestRule.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/solr/test-framework/src/java/org/apache/solr/util/SolrJettyTestRule.java b/solr/test-framework/src/java/org/apache/solr/util/SolrJettyTestRule.java index 9d05b0af949..ce0d044f744 100644 --- a/solr/test-framework/src/java/org/apache/solr/util/SolrJettyTestRule.java +++ b/solr/test-framework/src/java/org/apache/solr/util/SolrJettyTestRule.java @@ -55,9 +55,10 @@ public class SolrJettyTestRule extends SolrClientTestRule { throw e; } catch (Exception e) { throw new RuntimeException(e); + } finally { + jetty = null; + enableProxy = false; } - jetty = null; - enableProxy = false; } }
