Use Executor service

Author: tlrx

test/framework/src/main/java/org/elasticsearch/repositories/blobstore/ESMockAPIBasedRepositoryIntegTestCase.java

@@ -41,6 +41,9 @@
 import java.net.InetSocketAddress;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
@@ -54,11 +57,14 @@
 public abstract class ESMockAPIBasedRepositoryIntegTestCase extends ESBlobStoreRepositoryIntegTestCase {
 
     private static HttpServer httpServer;
+    private static ExecutorService executorService;
     private Map<String, HttpHandler> handlers;
 
     @BeforeClass
     public static void startHttpServer() throws Exception {
+        executorService = Executors.newCachedThreadPool();
         httpServer = MockHttpServer.createHttp(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0), 0);
+        httpServer.setExecutor(executorService);
         httpServer.start();
     }
 
@@ -75,9 +81,11 @@ public void setUpHttpServer() {
     }
 
     @AfterClass
-    public static void stopHttpServer() {
+    public static void stopHttpServer() throws Exception {
         httpServer.stop(0);
         httpServer = null;
+        executorService.shutdown();
+        assertTrue(executorService.awaitTermination(10L, TimeUnit.SECONDS));
     }
 
     @After