Cleanup static instance in @afterclass

astefan · astefan · commit e1e9b23db8a1 · 2019-10-31T23:24:40.000-04:00
diff --git a/x-pack/plugin/sql/jdbc/src/test/java/org/elasticsearch/xpack/sql/jdbc/JdbcHttpClientRequestTests.java b/x-pack/plugin/sql/jdbc/src/test/java/org/elasticsearch/xpack/sql/jdbc/JdbcHttpClientRequestTests.java
@@ -54,6 +54,7 @@ public static void init() throws Exception {
     @AfterClass
     public static void cleanup() {
         webServer.close();
+        webServer = null;
     }
 
     public void testBinaryRequestEnabled() throws Exception {
diff --git a/x-pack/plugin/sql/sql-client/src/test/java/org/elasticsearch/xpack/sql/client/HttpClientRequestTests.java b/x-pack/plugin/sql/sql-client/src/test/java/org/elasticsearch/xpack/sql/client/HttpClientRequestTests.java
@@ -60,6 +60,7 @@ public static void init() throws Exception {
     @AfterClass
     public static void cleanup() {
         webServer.close();
+        webServer = null;
     }
     
     public void testBinaryRequestForCLIEnabled() throws URISyntaxException {

Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,7 @@ public static void init() throws Exception {`
`54`	`54`	`@AfterClass`
`55`	`55`	`public static void cleanup() {`
`56`	`56`	`webServer.close();`
	`57`	`+ webServer = null;`
`57`	`58`	`}`
`58`	`59`
`59`	`60`	`public void testBinaryRequestEnabled() throws Exception {`
Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,7 @@ public static void init() throws Exception {`
`60`	`60`	`@AfterClass`
`61`	`61`	`public static void cleanup() {`
`62`	`62`	`webServer.close();`
	`63`	`+ webServer = null;`
`63`	`64`	`}`
`64`	`65`
`65`	`66`	`public void testBinaryRequestForCLIEnabled() throws URISyntaxException {`