Changed future.channel() to channel which is guarded to be non null

Author: Rachid Ben Moussa

Diff for: client/src/main/java/org/asynchttpclient/netty/request/NettyRequestSender.java

@@ -464,7 +464,7 @@ private void scheduleReadTimeout(NettyResponseFuture<?> nettyResponseFuture) {
   public void abort(Channel channel, NettyResponseFuture<?> future, Throwable t) {
 
     if (channel != null) {
-      Object attribute = Channels.getAttribute(future.channel());
+      Object attribute = Channels.getAttribute(channel);
       if (attribute instanceof StreamedResponsePublisher) {
         ((StreamedResponsePublisher) attribute).setError(t);
       }

Diff for: client/src/test/java/org/asynchttpclient/netty/NettyConnectionResetByPeerTest.java

@@ -41,12 +41,11 @@ public void testAsyncHttpClientConnectionResetByPeer() throws InterruptedExcepti
                     .build();
             new DefaultAsyncHttpClient(config).executeRequest(
                     new RequestBuilder("GET").setUrl(resettingServerAddress)
-            ).get();
+            )
+                    .get();
         } catch (ExecutionException e) {
             Throwable ex = e.getCause();
-            assertThat(ex, is(not(instanceOf(TimeoutException.class))));
             assertThat(ex, is(instanceOf(IOException.class)));
-//            assertTrue(ex.getMessage().equalsIgnoreCase("Connection reset by peer"));
         }
     }
 
@@ -79,7 +78,8 @@ private static String createServer(Consumer<Socket> handler) {
                 }
             } catch (Exception e) {
                 if (e instanceof InterruptedException) {
-                    Thread.currentThread().interrupt();
+                    Thread.currentThread()
+                            .interrupt();
                 }
                 throw new RuntimeException(e);
             }
@@ -93,7 +93,8 @@ private static String tryGetAddress(Exchanger<Integer> portHolder) {
         try {
             return "http://localhost:" + portHolder.exchange(0);
         } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
+            Thread.currentThread()
+                    .interrupt();
             throw new RuntimeException(e);
         }
     }