try to make stopping of the WebSockets more robust

rbri · rbri · commit 9b660bb8e0af · 2019-12-21T11:27:03.000+01:00
diff --git a/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/WebSocket.java b/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/WebSocket.java
@@ -380,17 +380,28 @@ public void close() throws IOException {
     public void close(final Object code, final Object reason) {
         if (readyState_ != CLOSED) {
             if (incomingSession_ != null) {
-                incomingSession_.close();
+                try {
+                    incomingSession_.close();
+                }
+                catch (final Throwable e) {
+                    LOG.error("WS close error - incomingSession_.close() failed", e);
+                }
             }
             if (outgoingSession_ != null) {
-                outgoingSession_.close();
+                try {
+                    outgoingSession_.close();
+                }
+                catch (final Throwable e) {
+                    LOG.error("WS close error - outgoingSession_.close() failed", e);
+                }
             }
         }
 
         try {
             if (client_ != null) {
                 try {
                     client_.stop();
+                    client_.destroy();
                 }
                 catch (final UpgradeException e) {
                     LOG.error("WS stop error (connection was not established so far)", e);
diff --git a/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/WebSocketTest.java b/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/WebSocketTest.java
@@ -697,4 +697,27 @@ public void prototypeUrl() throws Exception {
             + "</body></html>";
         loadPageWithAlerts2(html);
     }
+
+    /**
+     * @throws Exception if the test fails
+     */
+    @Test
+    public void socketsGetClosedOnPageReplace() throws Exception {
+        startWebServer("src/test/resources/com/gargoylesoftware/htmlunit/javascript/host",
+                null, null, new ChatWebSocketHandler());
+        try {
+            final WebDriver driver = getWebDriver();
+            driver.get(URL_FIRST + "WebSocketTest_chat.html");
+
+            driver.findElement(By.id("username")).sendKeys("Browser");
+            driver.findElement(By.id("joinB")).click();
+
+            assertVisible("joined", driver);
+
+            driver.get(URL_FIRST + "plain.html");
+        }
+        finally {
+            stopWebServers();
+        }
+    }
 }
diff --git a/src/test/resources/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDocumentTest_cookieInLocalFile.html b/src/test/resources/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDocumentTest_cookieInLocalFile.html
diff --git a/src/test/resources/com/gargoylesoftware/htmlunit/javascript/host/plain.html b/src/test/resources/com/gargoylesoftware/htmlunit/javascript/host/plain.html
@@ -0,0 +1,7 @@
+<html>
+	<head>
+	</head>
+	<body>
+		foo
+	</body>
+</html>

-Original file line number
+Diff line change
@@ @@ -0,0 +1,7 @@ @@
 +<html>
 +	<head>
 +	</head>
 +	<body>
 +		foo
 +	</body>
 +</html>