Merge pull request #679 from jooby-project/677

netty: random java.nio.channels.ClosedChannelException: null while cl…

Author: jknack

jooby-netty/src/main/java/org/jooby/internal/netty/NettyWebSocket.java

@@ -18,7 +18,7 @@
  */
 package org.jooby.internal.netty;
 
-import static io.netty.channel.ChannelFutureListener.FIRE_EXCEPTION_ON_FAILURE;
+import static io.netty.channel.ChannelFutureListener.CLOSE;
 import static java.util.Objects.requireNonNull;
 
 import java.io.IOException;
@@ -50,8 +50,8 @@
 
 public class NettyWebSocket implements NativeWebSocket {
 
-  public static final AttributeKey<NettyWebSocket> KEY =
-      AttributeKey.newInstance(NettyWebSocket.class.getName());
+  public static final AttributeKey<NettyWebSocket> KEY = AttributeKey
+      .newInstance(NettyWebSocket.class.getName());
 
   /** The logging system. */
   private final Logger log = LoggerFactory.getLogger(getClass());
@@ -84,7 +84,7 @@ public NettyWebSocket(final ChannelHandlerContext ctx,
   @Override
   public void close(final int status, final String reason) {
     handshaker.close(ctx.channel(), new CloseWebSocketFrame(status, reason))
-        .addListener(FIRE_EXCEPTION_ON_FAILURE);
+        .addListener(CLOSE);
     Attribute<NettyWebSocket> ws = ctx.channel().attr(KEY);
     if (ws != null) {
       ws.set(null);
@@ -135,7 +135,7 @@ public void pause() {
   @Override
   public void terminate() throws IOException {
     this.onCloseCallback.accept(1006, Optional.of("Harsh disconnect"));
-    ctx.disconnect().addListener(FIRE_EXCEPTION_ON_FAILURE);
+    ctx.disconnect().addListener(CLOSE);
   }
 
   @Override
@@ -193,7 +193,7 @@ public void handle(final Object msg) {
       int statusCode = closeFrame.statusCode();
       onCloseCallback.accept(statusCode == -1 ? WebSocket.NORMAL.code() : statusCode,
           Optional.ofNullable(closeFrame.reasonText()));
-      handshaker.close(ctx.channel(), closeFrame).addListener(FIRE_EXCEPTION_ON_FAILURE);
+      handshaker.close(ctx.channel(), closeFrame).addListener(CLOSE);
     } else if (msg instanceof Throwable) {
       onErrorCallback.accept((Throwable) msg);
     }

jooby-netty/src/test/java/org/jooby/internal/netty/NettyWebSocketTest.java

@@ -1,6 +1,6 @@
 package org.jooby.internal.netty;
 
-import static io.netty.channel.ChannelFutureListener.FIRE_EXCEPTION_ON_FAILURE;
+import static io.netty.channel.ChannelFutureListener.CLOSE;
 import static org.easymock.EasyMock.expect;
 import static org.easymock.EasyMock.expectLastCall;
 import static org.easymock.EasyMock.isA;
@@ -57,7 +57,7 @@ public class NettyWebSocketTest {
         1001, "normal");
 
     ChannelFuture future = unit.mock(ChannelFuture.class);
-    expect(future.addListener(FIRE_EXCEPTION_ON_FAILURE)).andReturn(future);
+    expect(future.addListener(CLOSE)).andReturn(future);
 
     WebSocketServerHandshaker handshaker = unit.get(WebSocketServerHandshaker.class);
     expect(handshaker.close(ch, frame)).andReturn(future);
@@ -202,7 +202,7 @@ public void terminate() throws Exception {
               callback.accept(1006, Optional.of("Harsh disconnect"));
 
               ChannelFuture future = unit.mock(ChannelFuture.class);
-              expect(future.addListener(FIRE_EXCEPTION_ON_FAILURE)).andReturn(future);
+              expect(future.addListener(CLOSE)).andReturn(future);
 
               ChannelHandlerContext ctx = unit.get(ChannelHandlerContext.class);
               expect(ctx.disconnect()).andReturn(future);
@@ -584,7 +584,7 @@ public void handleCloseFrame() throws Exception {
               expect(ctx.channel()).andReturn(ch);
 
               ChannelFuture future = unit.mock(ChannelFuture.class);
-              expect(future.addListener(FIRE_EXCEPTION_ON_FAILURE)).andReturn(future);
+              expect(future.addListener(CLOSE)).andReturn(future);
 
               WebSocketServerHandshaker handshaker = unit.get(WebSocketServerHandshaker.class);
               expect(handshaker.close(ch, retain)).andReturn(future);
@@ -625,7 +625,7 @@ public void handleCloseWithStatusFrame() throws Exception {
               expect(ctx.channel()).andReturn(ch);
 
               ChannelFuture future = unit.mock(ChannelFuture.class);
-              expect(future.addListener(FIRE_EXCEPTION_ON_FAILURE)).andReturn(future);
+              expect(future.addListener(CLOSE)).andReturn(future);
 
               WebSocketServerHandshaker handshaker = unit.get(WebSocketServerHandshaker.class);
               expect(handshaker.close(ch, retain)).andReturn(future);