Fix for the Grizzly side of AsyncHttpClient#101 : [websocket] onError must not be called when status code is != 101.

Author: rlubke

src/main/java/com/ning/http/client/providers/grizzly/GrizzlyAsyncHttpProvider.java

@@ -1288,39 +1288,46 @@ protected void onHttpHeadersParsed(HttpHeader httpHeader,
                     return;
                 }
             }
-
-            if (context.currentState != AsyncHandler.STATE.ABORT) {
-                boolean upgrade = context.currentState == AsyncHandler.STATE.UPGRADE;
+            if (context.isWSRequest) {
                 try {
-                    context.currentState = handler.onHeadersReceived(
-                            responseHeaders);
-                } catch (Exception e) {
-                    httpHeader.setSkipRemainder(true);
-                    context.abort(e);
-                    return;
-                }
-                if (upgrade) {
-                    try {
+                    context.protocolHandler.setConnection(ctx.getConnection());
+                    DefaultWebSocket ws = new DefaultWebSocket(context.protocolHandler);
+                    context.webSocket = new GrizzlyWebSocketAdapter(ws);
+                    if (context.currentState == AsyncHandler.STATE.UPGRADE) {
                         httpHeader.setChunked(false);
-                        context.protocolHandler.setConnection(ctx.getConnection());
-                        DefaultWebSocket ws = new DefaultWebSocket(context.protocolHandler);
                         ws.onConnect();
-                        context.webSocket = new GrizzlyWebSocketAdapter(ws);
                         WebSocketEngine.getEngine().setWebSocketHolder(ctx.getConnection(),
                                 context.protocolHandler,
                                 ws);
                         ((WebSocketUpgradeHandler) context.handler).onSuccess(context.webSocket);
                         final int wsTimeout = context.provider.clientConfig.getWebSocketIdleTimeoutInMs();
                         IdleTimeoutFilter.setCustomTimeout(ctx.getConnection(),
-                                                           ((wsTimeout <= 0)
-                                                                   ? IdleTimeoutFilter.FOREVER
-                                                                   : wsTimeout),
-                                                           TimeUnit.MILLISECONDS);
+                                ((wsTimeout <= 0)
+                                        ? IdleTimeoutFilter.FOREVER
+                                        : wsTimeout),
+                                TimeUnit.MILLISECONDS);
                         context.result(handler.onCompleted());
+                    } else {
+                        httpHeader.setSkipRemainder(true);
+                        ((WebSocketUpgradeHandler) context.handler).
+                                onClose(context.webSocket,
+                                        1002,
+                                        "WebSocket protocol error: unexpected HTTP response status during handshake.");
+                        context.result(null);
+                    }
+                } catch (Exception e) {
+                    httpHeader.setSkipRemainder(true);
+                    context.abort(e);
+                }
+            } else {
+                if (context.currentState != AsyncHandler.STATE.ABORT) {
+                    try {
+                        context.currentState = handler.onHeadersReceived(
+                                responseHeaders);
                     } catch (Exception e) {
                         httpHeader.setSkipRemainder(true);
                         context.abort(e);
-                    } 
+                    }
                 }
             }