From 664cb81e6ddba5ac3d8683864228081f4ba61972 Mon Sep 17 00:00:00 2001 From: Lachlan Roberts Date: Mon, 6 Apr 2020 07:48:14 +1000 Subject: [PATCH] Issue #4747 - Default close status code should be normal status Signed-off-by: Lachlan Roberts --- .../jetty/websocket/javax/common/JavaxWebSocketSession.java | 2 +- .../jetty/websocket/javax/tests/JettySpecificConfigTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketSession.java b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketSession.java index 9cbe7d6056d..eed6587ab10 100644 --- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketSession.java +++ b/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketSession.java @@ -179,7 +179,7 @@ public class JavaxWebSocketSession implements javax.websocket.Session @Override public void close() { - close(new CloseReason(CloseReason.CloseCodes.NO_STATUS_CODE, null)); + close(new CloseReason(CloseReason.CloseCodes.NORMAL_CLOSURE, null)); } /** diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/JettySpecificConfigTest.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/JettySpecificConfigTest.java index 4c48c350898..e1c61dab3a2 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/JettySpecificConfigTest.java +++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/JettySpecificConfigTest.java @@ -146,7 +146,7 @@ public class JettySpecificConfigTest // Close the Session. session.close(); assertTrue(clientEndpoint.closeLatch.await(5, TimeUnit.SECONDS)); - assertThat(clientEndpoint.closeReason.getCloseCode(), is(CloseReason.CloseCodes.NO_STATUS_CODE)); + assertThat(clientEndpoint.closeReason.getCloseCode(), is(CloseReason.CloseCodes.NORMAL_CLOSURE)); assertNull(clientEndpoint.error); } }