remove check for isOutputOpen and ignore failure in callback.

Signed-off-by: Lachlan Roberts <[email protected]>
jetty · Aug 3, 2022 · 030978d · 030978d
1 parent 8a8bc4e
commit 030978d
Show file tree

Hide file tree

Showing 2 changed files with 63 additions and 59 deletions.
diff --git a/...on/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler.java b/...on/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler.java
@@ -13,10 +13,31 @@
 
 package org.eclipse.jetty.websocket.javax.common;
 
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodType;
+import java.nio.ByteBuffer;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.stream.Collectors;
+import javax.websocket.ClientEndpointConfig;
+import javax.websocket.CloseReason;
+import javax.websocket.Decoder;
+import javax.websocket.EndpointConfig;
+import javax.websocket.MessageHandler;
+import javax.websocket.PongMessage;
+import javax.websocket.server.ServerEndpointConfig;
+
 import org.eclipse.jetty.util.BufferUtil;
 import org.eclipse.jetty.util.Callback;
 import org.eclipse.jetty.util.thread.AutoLock;
-import org.eclipse.jetty.websocket.core.*;
+import org.eclipse.jetty.websocket.core.CloseStatus;
+import org.eclipse.jetty.websocket.core.CoreSession;
+import org.eclipse.jetty.websocket.core.Frame;
+import org.eclipse.jetty.websocket.core.FrameHandler;
+import org.eclipse.jetty.websocket.core.OpCode;
 import org.eclipse.jetty.websocket.core.exception.ProtocolException;
 import org.eclipse.jetty.websocket.core.exception.WebSocketException;
 import org.eclipse.jetty.websocket.core.internal.messages.MessageSink;
@@ -33,18 +54,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.websocket.*;
-import javax.websocket.server.ServerEndpointConfig;
-import java.lang.invoke.MethodHandle;
-import java.lang.invoke.MethodType;
-import java.nio.ByteBuffer;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.stream.Collectors;
-
 public class JavaxWebSocketFrameHandler implements FrameHandler
 {
     private final AutoLock lock = new AutoLock();
@@ -587,24 +596,11 @@ private void acceptMessage(Frame frame, Callback callback)
 
     public void onPing(Frame frame, Callback callback)
     {
-        if (coreSession.isOutputOpen())
-        {
-            ByteBuffer payload = BufferUtil.copy(frame.getPayload());
-            coreSession.sendFrame(new Frame(OpCode.PONG).setPayload(payload), Callback.from(() ->
-            {
-                callback.succeeded();
-                coreSession.demand(1);
-            }, t ->
-            {
-                callback.failed(t);
-                coreSession.demand(1);
-            }), false);
-        }
-        else
+        coreSession.sendFrame(new Frame(OpCode.PONG).setPayload(frame.getPayload()), Callback.from(() ->
         {
             callback.succeeded();
             coreSession.demand(1);
-        }
+        }), false);
     }
 
     public void onPong(Frame frame, Callback callback)

diff --git a/...y-common/src/main/java/org/eclipse/jetty/websocket/common/JettyWebSocketFrameHandler.java b/...y-common/src/main/java/org/eclipse/jetty/websocket/common/JettyWebSocketFrameHandler.java
@@ -13,25 +13,39 @@
 
 package org.eclipse.jetty.websocket.common;
 
+import java.lang.invoke.MethodHandle;
+import java.nio.ByteBuffer;
+import java.nio.channels.ClosedChannelException;
+import java.util.concurrent.Executor;
+import java.util.concurrent.atomic.AtomicBoolean;
+
 import org.eclipse.jetty.util.BufferUtil;
 import org.eclipse.jetty.util.Callback;
 import org.eclipse.jetty.util.thread.AutoLock;
-import org.eclipse.jetty.websocket.api.*;
+import org.eclipse.jetty.websocket.api.BatchMode;
+import org.eclipse.jetty.websocket.api.UpgradeRequest;
+import org.eclipse.jetty.websocket.api.UpgradeResponse;
+import org.eclipse.jetty.websocket.api.WebSocketContainer;
+import org.eclipse.jetty.websocket.api.WriteCallback;
 import org.eclipse.jetty.websocket.core.CloseStatus;
+import org.eclipse.jetty.websocket.core.Configuration;
+import org.eclipse.jetty.websocket.core.CoreSession;
 import org.eclipse.jetty.websocket.core.Frame;
-import org.eclipse.jetty.websocket.core.*;
-import org.eclipse.jetty.websocket.core.exception.*;
+import org.eclipse.jetty.websocket.core.FrameHandler;
+import org.eclipse.jetty.websocket.core.OpCode;
+import org.eclipse.jetty.websocket.core.exception.BadPayloadException;
+import org.eclipse.jetty.websocket.core.exception.CloseException;
+import org.eclipse.jetty.websocket.core.exception.InvalidSignatureException;
+import org.eclipse.jetty.websocket.core.exception.MessageTooLargeException;
+import org.eclipse.jetty.websocket.core.exception.ProtocolException;
+import org.eclipse.jetty.websocket.core.exception.UpgradeException;
+import org.eclipse.jetty.websocket.core.exception.WebSocketException;
+import org.eclipse.jetty.websocket.core.exception.WebSocketTimeoutException;
 import org.eclipse.jetty.websocket.core.internal.messages.MessageSink;
 import org.eclipse.jetty.websocket.core.internal.util.InvokerUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.lang.invoke.MethodHandle;
-import java.nio.ByteBuffer;
-import java.nio.channels.ClosedChannelException;
-import java.util.concurrent.Executor;
-import java.util.concurrent.atomic.AtomicBoolean;
-
 public class JettyWebSocketFrameHandler implements FrameHandler
 {
     private enum SuspendState
@@ -357,30 +371,24 @@ private void onPingFrame(Frame frame, Callback callback)
         }
         else
         {
-            // Automatically respond if output is open.
-            if (coreSession.isOutputOpen())
+            // Automatically respond.
+            getSession().getRemote().sendPong(frame.getPayload(), new WriteCallback()
             {
-                ByteBuffer payload = BufferUtil.copy(frame.getPayload());
-                getSession().getRemote().sendPong(payload, new WriteCallback()
+                @Override
+                public void writeSuccess()
                 {
-                    @Override
-                    public void writeSuccess() {
-                        callback.succeeded();
-                        demand();
-                    }
-
-                    @Override
-                    public void writeFailed(Throwable x) {
-                        callback.failed(x);
-                        demand();
-                    }
-                });
-            }
-            else
-            {
-                callback.succeeded();
-                demand();
-            }
+                    callback.succeeded();
+                    demand();
+                }
+
+                @Override
+                public void writeFailed(Throwable x)
+                {
+                    // Ignore failures, we might be output closed and receive ping.
+                    callback.succeeded();
+                    demand();
+                }
+            });
         }
     }