diff --git a/src/com/wentch/redkale/net/http/WebSocketRunner.java b/src/com/wentch/redkale/net/http/WebSocketRunner.java index b46650c02..082c88869 100644 --- a/src/com/wentch/redkale/net/http/WebSocketRunner.java +++ b/src/com/wentch/redkale/net/http/WebSocketRunner.java @@ -39,18 +39,17 @@ public class WebSocketRunner implements Runnable { private AtomicBoolean writing = new AtomicBoolean(); - private final Coder coder; + private final Coder coder = new Coder(); private final BlockingQueue queue = new ArrayBlockingQueue(1024); private final boolean wsbinary; - public WebSocketRunner(Context context, WebSocket webSocket, AsyncConnection channel, final boolean maskData, final boolean wsbinary) { + public WebSocketRunner(Context context, WebSocket webSocket, AsyncConnection channel, final boolean wsbinary) { this.context = context; this.engine = webSocket.engine; this.webSocket = webSocket; this.channel = channel; - this.coder = new Coder(maskData); this.wsbinary = wsbinary; webSocket.runner = this; this.coder.logger = context.getLogger(); @@ -359,7 +358,7 @@ public class WebSocketRunner implements Runnable { protected byte outFragmentedType; - protected final boolean maskData; + protected final boolean maskData = false; protected boolean processingFragment; @@ -367,10 +366,6 @@ public class WebSocketRunner implements Runnable { private Logger logger; - Coder(boolean maskData) { - this.maskData = maskData; - } - /** 0 1 2 3 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 diff --git a/src/com/wentch/redkale/net/http/WebSocketServlet.java b/src/com/wentch/redkale/net/http/WebSocketServlet.java index 235dfe8fd..d4043d006 100644 --- a/src/com/wentch/redkale/net/http/WebSocketServlet.java +++ b/src/com/wentch/redkale/net/http/WebSocketServlet.java @@ -116,7 +116,6 @@ public abstract class WebSocketServlet extends HttpServlet implements Nameable { response.setHeader("Connection", "Upgrade"); response.addHeader("Upgrade", "websocket"); response.addHeader("Sec-WebSocket-Accept", key); - final boolean mask = "13".equals(request.getHeader("Sec-WebSocket-Version")); response.sendBody((ByteBuffer) null, null, new CompletionHandler() { @Override @@ -130,7 +129,7 @@ public abstract class WebSocketServlet extends HttpServlet implements Nameable { } webSocket.groupid = groupid; engine.add(webSocket); - context.submit(new WebSocketRunner(context, webSocket, response.removeChannel(), mask, wsbinary)); + context.submit(new WebSocketRunner(context, webSocket, response.removeChannel(), wsbinary)); response.finish(true); }