Skip to content

Commit b62bd15

Browse files
committed
1 parent e6cf447 commit b62bd15

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

src/main/java/com/ning/http/client/providers/netty/NettyWebSocket.java

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@
1919
import com.ning.http.client.websocket.WebSocketTextListener;
2020
import org.jboss.netty.channel.Channel;
2121
import org.jboss.netty.handler.codec.http.websocketx.BinaryWebSocketFrame;
22+
import org.jboss.netty.handler.codec.http.websocketx.CloseWebSocketFrame;
2223
import org.jboss.netty.handler.codec.http.websocketx.PingWebSocketFrame;
2324
import org.jboss.netty.handler.codec.http.websocketx.PongWebSocketFrame;
2425
import org.jboss.netty.handler.codec.http.websocketx.TextWebSocketFrame;
2526
import org.slf4j.Logger;
2627
import org.slf4j.LoggerFactory;
2728

28-
import java.util.concurrent.ConcurrentLinkedQueue;
29-
3029
import java.io.ByteArrayOutputStream;
30+
import java.util.concurrent.ConcurrentLinkedQueue;
3131

3232
import static org.jboss.netty.buffer.ChannelBuffers.wrappedBuffer;
3333

@@ -116,7 +116,12 @@ public boolean isOpen() {
116116
public void close() {
117117
onClose();
118118
listeners.clear();
119-
channel.close();
119+
try {
120+
channel.write(new CloseWebSocketFrame());
121+
channel.getCloseFuture().awaitUninterruptibly();
122+
} finally {
123+
channel.close();
124+
}
120125
}
121126

122127
protected void onBinaryFragment(byte[] message, boolean last) {

0 commit comments

Comments
 (0)