From 83fbd5bf0d471cc1dc460b151e236b18ccdad920 Mon Sep 17 00:00:00 2001 From: dreis2211 Date: Sun, 19 Mar 2017 19:31:36 +0100 Subject: [PATCH] Issue #1411 - Use short-circuit operator in websocket Frame Signed-off-by: dreis2211 --- .../java/org/eclipse/jetty/websocket/api/extensions/Frame.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jetty-websocket/websocket-api/src/main/java/org/eclipse/jetty/websocket/api/extensions/Frame.java b/jetty-websocket/websocket-api/src/main/java/org/eclipse/jetty/websocket/api/extensions/Frame.java index d6aa16ea395..519e1bc2ed7 100644 --- a/jetty-websocket/websocket-api/src/main/java/org/eclipse/jetty/websocket/api/extensions/Frame.java +++ b/jetty-websocket/websocket-api/src/main/java/org/eclipse/jetty/websocket/api/extensions/Frame.java @@ -65,7 +65,7 @@ public interface Frame public boolean isData() { - return (opcode == TEXT.getOpCode()) | (opcode == BINARY.getOpCode()); + return (opcode == TEXT.getOpCode()) || (opcode == BINARY.getOpCode()); } public boolean isContinuation()