add IdleTimeout test, use volatile sessions

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>

jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/proxy/WebSocketProxy.java

@@ -76,7 +76,7 @@ public boolean awaitClose(long timeout)
 
     public class ClientToProxy implements WebSocketPartialListener, WebSocketPingPongListener
     {
-        private Session session;
+        private volatile Session session;
         private final CountDownLatch closeLatch = new CountDownLatch(1);
         private final AtomicInteger pingsReceived = new AtomicInteger();
 
@@ -211,7 +211,7 @@ public void onWebSocketClose(int statusCode, String reason)
 
     public class ProxyToServer implements WebSocketPartialListener, WebSocketPingPongListener
     {
-        private Session session;
+        private volatile Session session;
         private final CountDownLatch closeLatch = new CountDownLatch(1);
         private final AtomicInteger pingsReceived = new AtomicInteger();
 
@@ -223,6 +223,7 @@ public Session getSession()
         public void fail(Throwable failure)
         {
             // Only ProxyToServer can be failed before it is opened (if ClientToProxy fails before the connect completes).
+            Session session = this.session;
             if (session != null)
                 session.close(StatusCode.SERVER_ERROR, failure.getMessage());
         }

jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/proxy/WebSocketProxyTest.java

@@ -49,6 +49,7 @@
 import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.is;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
@@ -203,7 +204,7 @@ public void testServerError() throws Exception
     }
 
     @Test
-    public void testServerErrorClientNoResponse() throws Exception
+    public void testServerThrowsOnMessage() throws Exception
     {
         serverSocket = new OnTextThrowingSocket();
 
@@ -230,6 +231,37 @@ public void testServerErrorClientNoResponse() throws Exception
         assertTrue(webSocketProxy.awaitClose(5000));
     }
 
+    @Test
+    public void timeoutTest() throws Exception
+    {
+        long clientSessionIdleTimeout = 2000;
+
+        EventSocket clientSocket = new EventSocket();
+        client.connect(clientSocket, proxyUri);
+        assertTrue(clientSocket.openLatch.await(5, TimeUnit.SECONDS));
+        assertTrue(serverSocket.openLatch.await(5, TimeUnit.SECONDS));
+
+        // Configure infinite idleTimeout on the server session and short timeout on the client session.
+        clientSocket.session.setIdleTimeout(clientSessionIdleTimeout);
+        serverSocket.session.setIdleTimeout(-1);
+
+        // Send and receive an echo message.
+        clientSocket.session.getRemote().sendString("test echo message");
+        assertThat(clientSocket.textMessages.poll(clientSessionIdleTimeout, TimeUnit.SECONDS), is("test echo message"));
+
+        // Wait more than the idleTimeout period, the clientToProxy connection should fail which should fail the proxyToServer.
+        assertTrue(clientSocket.closeLatch.await(clientSessionIdleTimeout * 2, TimeUnit.MILLISECONDS));
+        assertTrue(serverSocket.closeLatch.await(clientSessionIdleTimeout * 2, TimeUnit.MILLISECONDS));
+
+        // Check errors and close status.
+        assertThat(clientSocket.error.getMessage(), containsString("Idle timeout expired"));
+        assertThat(clientSocket.closeCode, is(StatusCode.SHUTDOWN));
+        assertThat(clientSocket.closeReason, containsString("Idle timeout expired"));
+        assertNull(serverSocket.error);
+        assertThat(serverSocket.closeCode, is(StatusCode.SHUTDOWN));
+        assertThat(serverSocket.closeReason, containsString("Idle timeout expired"));
+    }
+
     @Test
     public void testPingPong() throws Exception
     {