more npe fixes

rbri · rbri · commit 3e6f3e72930f · 2018-10-28T11:49:16.000+01:00
diff --git a/src/test/java/com/gargoylesoftware/htmlunit/InsecureHttpsServer.java b/src/test/java/com/gargoylesoftware/htmlunit/InsecureHttpsServer.java
@@ -112,15 +112,18 @@ public void handle(final HttpRequest request, final HttpResponse response, final
             };
             localServer_.register("*", handler);
         }
-        WebServerTestCase.tryBind(getPort(), () -> localServer_.start());
+        WebServerTestCase.tryBind(-1, () -> localServer_.start());
     }
 
     /**
      * Stops the server.
      * @throws Exception in case of exception
      */
     public void stop() throws Exception {
-        localServer_.shutDown();
+        if (localServer_ != null) {
+            localServer_.shutDown();
+        }
+        localServer_ = null;
     }
 
     /**
diff --git a/src/test/java/com/gargoylesoftware/htmlunit/SocksProxyTest.java b/src/test/java/com/gargoylesoftware/htmlunit/SocksProxyTest.java
@@ -92,7 +92,7 @@ public void httpsWithBadProxyPortShouldFail() throws Exception {
     private void doHttpsTest(final WebClient webClient) throws Exception {
         final InsecureHttpsServer server = new InsecureHttpsServer(SocksProxyTestServlet.HTML);
         try {
-            WebServerTestCase.tryBind(server.getPort(), () -> server.start());
+            WebServerTestCase.tryBind(-1, () -> server.start());
             webClient.getOptions().setUseInsecureSSL(true);
 
             final String url = "https://" + server.getHostName() + ":" + server.getPort();

Original file line number	Diff line number	Diff line change
`@@ -112,15 +112,18 @@ public void handle(final HttpRequest request, final HttpResponse response, final`
`112`	`112`	`};`
`113`	`113`	`localServer_.register("*", handler);`
`114`	`114`	`}`
`115`		`- WebServerTestCase.tryBind(getPort(), () -> localServer_.start());`
	`115`	`+ WebServerTestCase.tryBind(-1, () -> localServer_.start());`
`116`	`116`	`}`
`117`	`117`
`118`	`118`	`/**`
`119`	`119`	`* Stops the server.`
`120`	`120`	`* @throws Exception in case of exception`
`121`	`121`	`*/`
`122`	`122`	`public void stop() throws Exception {`
`123`		`- localServer_.shutDown();`
	`123`	`+ if (localServer_ != null) {`
	`124`	`+ localServer_.shutDown();`
	`125`	`+ }`
	`126`	`+ localServer_ = null;`
`124`	`127`	`}`
`125`	`128`
`126`	`129`	`/**`