Browse Source

write operation replaced with writeAndFlush

master
Nikita 11 years ago
parent
commit
15986dbd5d
  1. 4
      src/main/java/com/corundumstudio/socketio/handler/AuthorizeHandler.java
  2. 2
      src/main/java/com/corundumstudio/socketio/handler/WrongUrlHandler.java
  3. 2
      src/main/java/com/corundumstudio/socketio/transport/WebSocketClient.java
  4. 4
      src/main/java/com/corundumstudio/socketio/transport/XHRPollingClient.java
  5. 4
      src/main/java/com/corundumstudio/socketio/transport/XHRPollingTransport.java

4
src/main/java/com/corundumstudio/socketio/handler/AuthorizeHandler.java

@ -134,13 +134,13 @@ public class AuthorizeHandler extends ChannelInboundHandlerAdapter implements Di
if (jsonpParams != null) {
jsonpParam = jsonpParams.get(0);
}
channel.write(new AuthorizeMessage(msg, jsonpParam, origin, sessionId));
channel.writeAndFlush(new AuthorizeMessage(msg, jsonpParam, origin, sessionId));
authorizedSessionIds.put(sessionId, data);
log.debug("Handshake authorized for sessionId: {}", sessionId);
} else {
HttpResponse res = new DefaultHttpResponse(HTTP_1_1, HttpResponseStatus.FORBIDDEN);
ChannelFuture f = channel.write(res);
ChannelFuture f = channel.writeAndFlush(res);
f.addListener(ChannelFutureListener.CLOSE);
log.debug("Handshake unauthorized");

2
src/main/java/com/corundumstudio/socketio/handler/WrongUrlHandler.java

@ -44,7 +44,7 @@ public class WrongUrlHandler extends ChannelInboundHandlerAdapter {
QueryStringDecoder queryDecoder = new QueryStringDecoder(req.getUri());
HttpResponse res = new DefaultHttpResponse(HTTP_1_1, HttpResponseStatus.BAD_REQUEST);
ChannelFuture f = channel.write(res);
ChannelFuture f = channel.writeAndFlush(res);
f.addListener(ChannelFutureListener.CLOSE);
req.release();
log.warn("Blocked wrong socket.io-context request! url: {}, ip: {}", queryDecoder.path(), channel.remoteAddress());

2
src/main/java/com/corundumstudio/socketio/transport/WebSocketClient.java

@ -38,7 +38,7 @@ public class WebSocketClient extends MainBaseClient {
}
public ChannelFuture send(Packet packet) {
return getChannel().write(new WebSocketPacketMessage(getSessionId(), packet));
return getChannel().writeAndFlush(new WebSocketPacketMessage(getSessionId(), packet));
}
}

4
src/main/java/com/corundumstudio/socketio/transport/XHRPollingClient.java

@ -46,7 +46,7 @@ public class XHRPollingClient extends MainBaseClient {
public void bindChannel(Channel channel, String origin) {
this.origin = origin;
setChannel(channel);
channel.write(new XHRSendPacketsMessage(getSessionId(), origin, packetQueue));
channel.writeAndFlush(new XHRSendPacketsMessage(getSessionId(), origin, packetQueue));
}
public String getOrigin() {
@ -56,7 +56,7 @@ public class XHRPollingClient extends MainBaseClient {
public ChannelFuture send(Packet packet) {
packetQueue.add(packet);
if (getChannel().attr(WRITE_ONCE).get() == null) {
return getChannel().write(new XHRSendPacketsMessage(getSessionId(), origin, packetQueue));
return getChannel().writeAndFlush(new XHRSendPacketsMessage(getSessionId(), origin, packetQueue));
}
return getChannel().newSucceededFuture();
}

4
src/main/java/com/corundumstudio/socketio/transport/XHRPollingTransport.java

@ -109,7 +109,7 @@ public class XHRPollingTransport extends BaseTransport {
if (queryDecoder.parameters().containsKey("disconnect")) {
MainBaseClient client = sessionId2Client.get(sessionId);
client.onChannelDisconnect();
ctx.channel().write(new XHROutMessage(origin, sessionId));
ctx.channel().writeAndFlush(new XHROutMessage(origin, sessionId));
} else if (HttpMethod.POST.equals(req.getMethod())) {
onPost(sessionId, ctx, origin, req.content());
} else if (HttpMethod.GET.equals(req.getMethod())) {
@ -205,7 +205,7 @@ public class XHRPollingTransport extends BaseTransport {
Packet packet = new Packet(PacketType.ERROR);
packet.setReason(ErrorReason.CLIENT_NOT_HANDSHAKEN);
packet.setAdvice(ErrorAdvice.RECONNECT);
ctx.channel().write(new XHRErrorMessage(packet, origin, sessionId));
ctx.channel().writeAndFlush(new XHRErrorMessage(packet, origin, sessionId));
}
@Override

Loading…
Cancel
Save