Issue #4747 - Default close status code should be normal status

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
jetty · Apr 5, 2020 · 664cb81 · 664cb81
1 parent 9b57fcd
commit 664cb81
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketSession.java b/...-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketSession.java
@@ -179,7 +179,7 @@ public void addMessageHandler(MessageHandler handler) throws IllegalStateExcepti
     @Override
     public void close()
     {
-        close(new CloseReason(CloseReason.CloseCodes.NO_STATUS_CODE, null));
+        close(new CloseReason(CloseReason.CloseCodes.NORMAL_CLOSURE, null));
     }
 
     /**

diff --git a/...-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/JettySpecificConfigTest.java b/...-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/JettySpecificConfigTest.java
@@ -146,7 +146,7 @@ public void testJettySpecificConfig() throws Exception
         // 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);
     }
 }