From e1e9b23db8a1c24b12cbca83acdb90e0ad7638f1 Mon Sep 17 00:00:00 2001
From: Andrei Stefan <andrei@elastic.co>
Date: Thu, 31 Oct 2019 23:24:40 -0400
Subject: [PATCH] Cleanup static instance in @AfterClass

---
 .../elasticsearch/xpack/sql/jdbc/JdbcHttpClientRequestTests.java | 1 +
 .../elasticsearch/xpack/sql/client/HttpClientRequestTests.java   | 1 +
 2 files changed, 2 insertions(+)

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
index cd8ff60d71c..008bfced8fd 100644
--- 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 class JdbcHttpClientRequestTests extends ESTestCase {
     @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
index 7df82ebe1d4..8f5837c95b3 100644
--- 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 class HttpClientRequestTests extends ESTestCase {
     @AfterClass
     public static void cleanup() {
         webServer.close();
+        webServer = null;
     }
     
     public void testBinaryRequestForCLIEnabled() throws URISyntaxException {