Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

Tests: SolrJettyTestRule: harden cleanup

David Smiley05c15e8db737
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 061bdaa0d5f..467c6bb2b1b 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;
}
}