Fix jakartaee#598 - always count down message latch *after* message i…

…s written Signed-off-by: Mark Thomas <markt@apache.org>
scottmarlow · Jan 7, 2021 · 5ec1d0d · 5ec1d0d
1 parent 585a6fd
commit 5ec1d0d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/src/com/sun/ts/tests/websocket/ee/jakarta/websocket/clientendpointconfig/WSClient.java b/src/com/sun/ts/tests/websocket/ee/jakarta/websocket/clientendpointconfig/WSClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates and others.
+ * Copyright (c) 2013, 2021 Oracle and/or its affiliates and others.
  * All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -845,9 +845,9 @@ public void onOpen(Session session, EndpointConfig config) {
 
         @Override
         public void onMessage(String message) {
-          messageLatch.countDown();
           receivedMessageString
               .append("========Basic String MessageHander received=" + message);
+          messageLatch.countDown();
         }
       });
 

diff --git a/src/com/sun/ts/tests/websocket/ee/jakarta/websocket/sessionexception/WSClient.java b/src/com/sun/ts/tests/websocket/ee/jakarta/websocket/sessionexception/WSClient.java
@@ -164,8 +164,8 @@ public void onOpen(Session session, EndpointConfig config) {
 
         @Override
         public void onMessage(String message) {
-          messageLatch.countDown();
           receivedMessageString.append(message);
+          messageLatch.countDown();
         }
       });
     }

diff --git a/src/com/sun/ts/tests/websocket/spec/servercontainer/addendpoint/WSClient.java b/src/com/sun/ts/tests/websocket/spec/servercontainer/addendpoint/WSClient.java
@@ -1774,8 +1774,8 @@ public void onOpen(Session session, EndpointConfig config) {
 
         @Override
         public void onMessage(String message) {
-          messageLatch.countDown();
           receivedMessageString.append(message);
+          messageLatch.countDown();
         }
       });
 
@@ -1823,9 +1823,9 @@ public void onOpen(Session session, EndpointConfig config) {
   public final static class TCKBasicStringEndpoint extends Endpoint {
 
     public void onMessage(String message) {
-      messageLatch.countDown();
       receivedMessageString.append("========First TextMessageHander received=")
           .append(message);
+      messageLatch.countDown();
     }
 
     @Override
@@ -1909,8 +1909,8 @@ public void onOpen(Session session, EndpointConfig config) {
 
         @Override
         public void onMessage(String message) {
-          messageLatch.countDown();
           receivedMessageString.append(message);
+          messageLatch.countDown();
         }
       });
     }
@@ -1930,8 +1930,8 @@ public void onOpen(Session session, EndpointConfig config) {
 
         @Override
         public void onMessage(String message) {
-          messageLatch.countDown();
           receivedMessageString.append(message);
+          messageLatch.countDown();
         }
       });