Minor clean up

Author: Stephane Landelle

src/main/java/com/ning/http/client/providers/netty/request/NettyRequestSender.java

@@ -323,18 +323,9 @@ public <T> void writeRequest(NettyResponseFuture<T> future, Channel channel) {
             if (handler instanceof TransferCompletionHandler)
                 configureTransferAdapter(handler, httpRequest);
 
-            if (!future.isHeadersAlreadyWrittenOnContinue()) {
-                try {
-                    if (future.getAsyncHandler() instanceof AsyncHandlerExtensions)
-                        AsyncHandlerExtensions.class.cast(future.getAsyncHandler()).onSendRequest(nettyRequest);
-                    channel.write(httpRequest).addListener(new ProgressListener(config, future.getAsyncHandler(), future, true));
-                } catch (Throwable cause) {
-                    // FIXME why not notify?
-                    LOGGER.debug(cause.getMessage(), cause);
-                    // FIXME what about the attribute? how could this fail?
-                    Channels.silentlyCloseChannel(channel);
-                    return;
-                }
+            if (!future.isHeadersAlreadyWrittenOnContinue() &&future.getAsyncHandler() instanceof AsyncHandlerExtensions) {
+                AsyncHandlerExtensions.class.cast(future.getAsyncHandler()).onSendRequest(nettyRequest);
+                channel.write(httpRequest).addListener(new ProgressListener(config, future.getAsyncHandler(), future, true));
             }
 
             // FIXME what happens to this second write if the first one failed? Should it be done in the ProgressListener?
@@ -346,7 +337,8 @@ public <T> void writeRequest(NettyResponseFuture<T> future, Channel channel) {
             if (Channels.isChannelValid(channel))
                 scheduleTimeouts(future);
 
-        } catch (Throwable ioe) {
+        } catch (Throwable t) {
+            LOGGER.error("Can't write request", t);
             Channels.silentlyCloseChannel(channel);
         }
     }

src/main/java/com/ning/http/client/providers/netty/request/ProgressListener.java

@@ -52,11 +52,7 @@ private boolean abortOnThrowable(Throwable cause, Channel channel) {
         if (cause != null && future.getState() != NettyResponseFuture.STATE.NEW) {
             // The write operation failed. If the channel was cached, it means it got asynchronously closed.
             // Let's retry a second time.
-            if (cause instanceof IllegalStateException) {
-                LOGGER.debug(cause.getMessage(), cause);
-                Channels.silentlyCloseChannel(channel);
-
-            } else if (cause instanceof ClosedChannelException || StackTraceInspector.abortOnReadOrWriteException(cause)) {
+            if (cause instanceof IllegalStateException || cause instanceof ClosedChannelException || StackTraceInspector.abortOnReadOrWriteException(cause)) {
                 LOGGER.debug(cause == null ? "" : cause.getMessage(), cause);
                 Channels.silentlyCloseChannel(channel);