Merge pull request #1412 from dreis2211/short-circuit

Issue #1411 - Use short-circuit operator in websocket Frame
2017-03-19 13:08:21 -07:00 · 2017-03-19 13:08:21 -07:00 · a29b908361
parent 5ecb8b8526 83fbd5bf0d
commit a29b908361
1 changed files with 1 additions and 1 deletions
--- 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()