diff --git a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/OpCode.java b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/OpCode.java index a4f5018df1a..19d5df5e04c 100644 --- a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/OpCode.java +++ b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/OpCode.java @@ -99,7 +99,8 @@ public final class OpCode return "CONTINUATION"; case TEXT: return "TEXT"; - case BINARY: return "BINARY"; + case BINARY: + return "BINARY"; case CLOSE: return "CLOSE"; case PING: diff --git a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/Parser.java b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/Parser.java index 8138e6403ac..74d50d1d850 100644 --- a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/Parser.java +++ b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/Parser.java @@ -330,9 +330,9 @@ public class Parser policy.getBehavior(), OpCode.name(opcode), fin, - (isRsv1InUse()?'1':'.'), - (isRsv2InUse()?'1':'.'), - (isRsv3InUse()?'1':'.')); + (((b & 0x40) != 0)?'1':'.'), + (((b & 0x20) != 0)?'1':'.'), + (((b & 0x10) != 0)?'1':'.')); // base framing flags switch(opcode) @@ -651,7 +651,7 @@ public class Parser builder.append(",c=").append(cursor); builder.append(",len=").append(payloadLength); builder.append(",f=").append(frame); - builder.append(",p=").append(policy); + // builder.append(",p=").append(policy); builder.append("]"); return builder.toString(); }