destroy the server if bind fails

rbri · rbri · commit a4301102192c · 2018-10-28T17:19:02.000+01:00
diff --git a/src/test/java/com/gargoylesoftware/htmlunit/HttpWebConnectionProxyTest.java b/src/test/java/com/gargoylesoftware/htmlunit/HttpWebConnectionProxyTest.java
@@ -45,9 +45,10 @@ public void setup() throws Exception {
         WebDriverTestCase.stopWebServers();
         startWebServer("src/test/resources/testfiles/noproxyroot/");
 
-        proxyWebServer_ = createWebServer(PORT_PROXY_SERVER,
+        final Server proxyWebServer = createWebServer(PORT_PROXY_SERVER,
                                             "src/test/resources/testfiles/proxyroot/", null, null, null);
-        WebServerTestCase.tryStart(PORT_PROXY_SERVER, proxyWebServer_);
+        WebServerTestCase.tryStart(PORT_PROXY_SERVER, proxyWebServer);
+        proxyWebServer_ = proxyWebServer;
 
         final WebClient webClient = getWebClient();
 
diff --git a/src/test/java/com/gargoylesoftware/htmlunit/WebServerTestCase.java b/src/test/java/com/gargoylesoftware/htmlunit/WebServerTestCase.java
@@ -78,7 +78,7 @@ protected void startWebServer(final String resourceBase) throws Exception {
         if (server_ != null) {
             throw new IllegalStateException("startWebServer() can not be called twice");
         }
-        server_ = buildServer(PORT);
+        final Server server = buildServer(PORT);
 
         final WebAppContext context = new WebAppContext();
         context.setContextPath("/");
@@ -92,10 +92,11 @@ protected void startWebServer(final String resourceBase) throws Exception {
 
         final HandlerList handlers = new HandlerList();
         handlers.setHandlers(new Handler[]{resourceHandler, context});
-        server_.setHandler(handlers);
-        server_.setHandler(resourceHandler);
+        server.setHandler(handlers);
+        server.setHandler(resourceHandler);
 
-        tryStart(PORT, server_);
+        tryStart(PORT, server);
+        server_ = server;
     }
 
     /**
@@ -202,7 +203,7 @@ protected void startWebServer(final String resourceBase, final String[] classpat
         if (server_ != null) {
             throw new IllegalStateException("startWebServer() can not be called twice");
         }
-        server_ = buildServer(PORT);
+        final Server server = buildServer(PORT);
 
         final WebAppContext context = new WebAppContext();
         context.setContextPath("/");
@@ -220,9 +221,10 @@ protected void startWebServer(final String resourceBase, final String[] classpat
             }
         }
         context.setClassLoader(loader);
-        server_.setHandler(context);
+        server.setHandler(context);
 
-        tryStart(PORT, server_);
+        tryStart(PORT, server);
+        server_ = server;
     }
 
     /**
@@ -378,6 +380,10 @@ public static void tryStart(final int port, final Server server) throws Exceptio
             }
             catch (final BindException e) {
                 if (System.currentTimeMillis() > maxWait) {
+                    // destroy the server to free all associated resources
+                    server.stop();
+                    server.destroy();
+
                     throw (BindException) new BindException("Port " + port + " is already in use").initCause(e);
                 }
                 Thread.sleep(200);
