Fixes AsyncHttpClient#904

Author: jfarcand

src/main/java/com/ning/http/client/providers/netty/handler/Processor.java

@@ -125,7 +125,7 @@ public void channelClosed(ChannelHandlerContext ctx, ChannelStateEvent e) throws
                     && requestSender.applyIoExceptionFiltersAndReplayRequest(future, CHANNEL_CLOSED_EXCEPTION, channel))
                 return;
 
-            protocol.onClose(future);
+            protocol.onError(future, null);
             requestSender.handleUnexpectedClosedChannel(channel, future);
         }
     }

src/main/java/com/ning/http/client/providers/netty/handler/WebSocketProtocol.java

@@ -13,21 +13,6 @@
  */
 package com.ning.http.client.providers.netty.handler;
 
-import static com.ning.http.client.providers.netty.ws.WebSocketUtils.getAcceptKey;
-import static org.jboss.netty.handler.codec.http.HttpResponseStatus.SWITCHING_PROTOCOLS;
-
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.handler.codec.http.HttpChunk;
-import org.jboss.netty.handler.codec.http.HttpHeaders;
-import org.jboss.netty.handler.codec.http.HttpResponse;
-import org.jboss.netty.handler.codec.http.websocketx.BinaryWebSocketFrame;
-import org.jboss.netty.handler.codec.http.websocketx.CloseWebSocketFrame;
-import org.jboss.netty.handler.codec.http.websocketx.PingWebSocketFrame;
-import org.jboss.netty.handler.codec.http.websocketx.PongWebSocketFrame;
-import org.jboss.netty.handler.codec.http.websocketx.TextWebSocketFrame;
-import org.jboss.netty.handler.codec.http.websocketx.WebSocketFrame;
-
 import com.ning.http.client.AsyncHandler.STATE;
 import com.ning.http.client.AsyncHttpClientConfig;
 import com.ning.http.client.HttpResponseHeaders;
@@ -44,10 +29,24 @@
 import com.ning.http.client.providers.netty.response.NettyResponseStatus;
 import com.ning.http.client.providers.netty.ws.NettyWebSocket;
 import com.ning.http.client.ws.WebSocketUpgradeHandler;
+import org.jboss.netty.buffer.ChannelBuffer;
+import org.jboss.netty.channel.Channel;
+import org.jboss.netty.handler.codec.http.HttpChunk;
+import org.jboss.netty.handler.codec.http.HttpHeaders;
+import org.jboss.netty.handler.codec.http.HttpResponse;
+import org.jboss.netty.handler.codec.http.websocketx.BinaryWebSocketFrame;
+import org.jboss.netty.handler.codec.http.websocketx.CloseWebSocketFrame;
+import org.jboss.netty.handler.codec.http.websocketx.PingWebSocketFrame;
+import org.jboss.netty.handler.codec.http.websocketx.PongWebSocketFrame;
+import org.jboss.netty.handler.codec.http.websocketx.TextWebSocketFrame;
+import org.jboss.netty.handler.codec.http.websocketx.WebSocketFrame;
 
 import java.io.IOException;
 import java.util.Locale;
 
+import static com.ning.http.client.providers.netty.ws.WebSocketUtils.getAcceptKey;
+import static org.jboss.netty.handler.codec.http.HttpResponseStatus.SWITCHING_PROTOCOLS;
+
 public final class WebSocketProtocol extends Protocol {
 
     public WebSocketProtocol(ChannelManager channelManager,//
@@ -179,12 +178,14 @@ public void setContent(ChannelBuffer content) {
     public void onError(NettyResponseFuture<?> future, Throwable e) {
         logger.warn("onError {}", e);
 
+        Throwable throwable = e == null ? new UnexpectedWebSocketException() : e.getCause() == null ? e : e.getCause();
+
         try {
             WebSocketUpgradeHandler h = (WebSocketUpgradeHandler) future.getAsyncHandler();
 
             NettyWebSocket webSocket = NettyWebSocket.class.cast(h.onCompleted());
             if (webSocket != null) {
-                webSocket.onError(e.getCause());
+                webSocket.onError(throwable);
                 webSocket.close();
             }
         } catch (Throwable t) {
@@ -207,4 +208,7 @@ public void onClose(NettyResponseFuture<?> future) {
             logger.error("onError", t);
         }
     }
+
+    private final static class UnexpectedWebSocketException extends Exception {
+    }
 }