Minor clean up

Author: Stephane Landelle

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

@@ -23,6 +23,7 @@
 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.TextWebSocketFrame;
 import org.jboss.netty.handler.codec.http.websocketx.WebSocketFrame;
 
 import com.ning.http.client.AsyncHandler.STATE;
@@ -134,36 +135,34 @@ public void handle(Channel channel, NettyResponseFuture<?> future, Object e) thr
                     Channels.setDiscard(channel);
                     CloseWebSocketFrame closeFrame = CloseWebSocketFrame.class.cast(frame);
                     webSocket.onClose(closeFrame.getStatusCode(), closeFrame.getReasonText());
-                } else {
-
-                    if (frame.getBinaryData() != null) {
-                        HttpChunk webSocketChunk = new HttpChunk() {
-                            private ChannelBuffer content = frame.getBinaryData();
-
-                            @Override
-                            public boolean isLast() {
-                                return false;
-                            }
-
-                            @Override
-                            public ChannelBuffer getContent() {
-                                return content;
-                            }
-
-                            @Override
-                            public void setContent(ChannelBuffer content) {
-                                throw new UnsupportedOperationException();
-                            }
-                        };
-
-                        NettyResponseBodyPart rp = new NettyResponseBodyPart(null, webSocketChunk, true);
-                        handler.onBodyPartReceived(rp);
-
-                        if (frame instanceof BinaryWebSocketFrame) {
-                            webSocket.onBinaryFragment(rp.getBodyPartBytes(), frame.isFinalFragment());
-                        } else {
-                            webSocket.onTextFragment(frame.getBinaryData().toString(StandardCharsets.UTF_8), frame.isFinalFragment());
+
+                } else if (frame.getBinaryData() != null) {
+                    HttpChunk webSocketChunk = new HttpChunk() {
+                        private ChannelBuffer content = frame.getBinaryData();
+
+                        @Override
+                        public boolean isLast() {
+                            return frame.isFinalFragment();
+                        }
+
+                        @Override
+                        public ChannelBuffer getContent() {
+                            return content;
                         }
+
+                        @Override
+                        public void setContent(ChannelBuffer content) {
+                            throw new UnsupportedOperationException();
+                        }
+                    };
+
+                    NettyResponseBodyPart rp = new NettyResponseBodyPart(null, webSocketChunk, frame.isFinalFragment());
+                    handler.onBodyPartReceived(rp);
+
+                    if (frame instanceof BinaryWebSocketFrame) {
+                        webSocket.onBinaryFragment(rp.getBodyPartBytes(), frame.isFinalFragment());
+                    } else {
+                        webSocket.onTextFragment(frame.getBinaryData().toString(StandardCharsets.UTF_8), frame.isFinalFragment());
                     }
                 }
             } else {

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

@@ -188,22 +188,22 @@ public void onTextFragment(String message, boolean last) {
             }
         }
 
-        for (WebSocketListener l : listeners) {
-            if (l instanceof WebSocketTextListener) {
+        for (WebSocketListener listener : listeners) {
+            if (listener instanceof WebSocketTextListener) {
+                WebSocketTextListener textlistener = (WebSocketTextListener) listener;
                 try {
                     if (!last) {
-                        WebSocketTextListener.class.cast(l).onFragment(message, last);
+                        textlistener.onFragment(message, last);
                     } else {
                         if (textBuffer.length() > 0) {
-                            WebSocketTextListener.class.cast(l).onFragment(message, last);
-
-                            WebSocketTextListener.class.cast(l).onMessage(textBuffer.append(message).toString());
+                            textlistener.onFragment(message, last);
+                            textlistener.onMessage(textBuffer.append(message).toString());
                         } else {
-                            WebSocketTextListener.class.cast(l).onMessage(message);
+                            textlistener.onMessage(message);
                         }
                     }
                 } catch (Exception ex) {
-                    l.onError(ex);
+                    listener.onError(ex);
                 }
             }
         }