Incremental fix for AsyncHttpClient#101 [websocket] onError must not be called when status code is != 101. Fix Netty side

Author: jfarcand

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

@@ -2346,7 +2346,13 @@ public void handle(ChannelHandlerContext ctx, MessageEvent e) throws Exception {
                 s = new ResponseStatus(future.getURI(), response, NettyAsyncHttpProvider.this);
                 final boolean statusReceived = h.onStatusReceived(s) == STATE.UPGRADE;
 
-                if (!validStatus || !validUpgrade || !validConnection || !statusReceived) {
+                if (!statusReceived) {
+                    h.onClose(new NettyWebSocket(ctx.getChannel()), 1002, "Bad response status " + response.getStatus().getCode());
+                    future.done(null);
+                    return;
+                }
+
+                if (!validStatus || !validUpgrade || !validConnection) {
                     throw new IOException("Invalid handshake response");
                 }
 

src/main/java/com/ning/http/client/websocket/WebSocketUpgradeHandler.java

@@ -64,7 +64,7 @@ public final STATE onStatusReceived(HttpResponseStatus responseStatus) throws Ex
         if (responseStatus.getStatusCode() == 101) {
             return STATE.UPGRADE;
         } else {
-            throw new IllegalStateException("Invalid upgrade protocol, status should be 101 but was " + responseStatus.getStatusCode());
+            return STATE.ABORT;
         }
     }
 
@@ -113,6 +113,21 @@ public final void onFailure(Throwable t) {
         }
     }
 
+    public final void onClose(WebSocket webSocket, int status, String reasonPhrase) {
+        // Connect failure
+        if (this.webSocket == null) this.webSocket = webSocket;
+
+        for (WebSocketListener w : l) {
+            if (webSocket != null) {
+                webSocket.addWebSocketListener(w);
+            }
+            w.onClose(webSocket);
+            if (WebSocketCloseCodeReasonListener.class.isAssignableFrom(w.getClass())) {
+                WebSocketCloseCodeReasonListener.class.cast(w).onClose(webSocket, status, reasonPhrase);
+            }
+        }
+    }
+
     /**
      * Build a {@link WebSocketUpgradeHandler}
      */