Drop NettyResponseFuture:: isAndSetStatusReceived, close AsyncHttpClient#1349

slandelle · slandelle · commit 25b0e9b6134c · 2017-02-08T10:29:44.000+01:00
Motivation: I’m not sure what this code was for. It’s been there for ages (2010, the git repository doesn’t have older commits, see https://github.com/AsyncHttpClient/async-http-client/blob/8c62f3ea9c647a b057f3d9d4d1fef5d76b52e8e8/src/main/java/com/ning/http/client/providers/ netty/NettyResponseFuture.java#L65). I suspect this was used because of bugs that caused multiple submissions for the same request. Such bugs have been fixed since then. Let’s remove this dead code. Modifications: Remove `NettyResponseFuture:: isAndSetStatusReceived`. Result: Less dead code
diff --git a/client/src/main/java/org/asynchttpclient/netty/NettyResponseFuture.java b/client/src/main/java/org/asynchttpclient/netty/NettyResponseFuture.java
@@ -80,8 +80,6 @@ public final class NettyResponseFuture<V> implements ListenableFuture<V> {
     @SuppressWarnings("rawtypes")
     private static final AtomicIntegerFieldUpdater<NettyResponseFuture> inProxyAuthField = AtomicIntegerFieldUpdater.newUpdater(NettyResponseFuture.class, "inProxyAuth");
     @SuppressWarnings("rawtypes")
-    private static final AtomicIntegerFieldUpdater<NettyResponseFuture> statusReceivedField = AtomicIntegerFieldUpdater.newUpdater(NettyResponseFuture.class, "statusReceived");
-    @SuppressWarnings("rawtypes")
     private static final AtomicIntegerFieldUpdater<NettyResponseFuture> contentProcessedField = AtomicIntegerFieldUpdater.newUpdater(NettyResponseFuture.class, "contentProcessed");
     @SuppressWarnings("rawtypes")
     private static final AtomicIntegerFieldUpdater<NettyResponseFuture> onThrowableCalledField = AtomicIntegerFieldUpdater.newUpdater(NettyResponseFuture.class, "onThrowableCalled");
@@ -360,10 +358,6 @@ public void setChannelState(ChannelState channelState) {
         this.channelState = channelState;
     }
 
-    public boolean isAndSetStatusReceived(boolean sr) {
-        return statusReceivedField.getAndSet(this, sr ? 1 : 0) != 0;
-    }
-
     public boolean isStreamConsumed() {
         return streamAlreadyConsumed;
     }
diff --git a/client/src/main/java/org/asynchttpclient/netty/handler/HttpHandler.java b/client/src/main/java/org/asynchttpclient/netty/handler/HttpHandler.java
@@ -87,7 +87,7 @@ private boolean exitAfterHandlingStatus(//
             HttpResponse response, AsyncHandler<?> handler,//
             NettyResponseStatus status,//
             HttpRequest httpRequest) throws IOException, Exception {
-        return !future.isAndSetStatusReceived(true) && handler.onStatusReceived(status) != State.CONTINUE;
+        return handler.onStatusReceived(status) != State.CONTINUE;
     }
 
     private boolean exitAfterHandlingHeaders(//
diff --git a/client/src/main/java/org/asynchttpclient/netty/request/NettyRequestSender.java b/client/src/main/java/org/asynchttpclient/netty/request/NettyRequestSender.java
@@ -426,7 +426,6 @@ public boolean retry(NettyResponseFuture<?> future) {
 
         if (future.isReplayPossible()) {
             future.setChannelState(ChannelState.RECONNECTED);
-            future.isAndSetStatusReceived(false);
 
             LOGGER.debug("Trying to recover request {}\n", future.getNettyRequest().getHttpRequest());
             if (future.getAsyncHandler() instanceof AsyncHandlerExtensions) {

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ private boolean exitAfterHandlingStatus(//`
`87`	`87`	`HttpResponse response, AsyncHandler<?> handler,//`
`88`	`88`	`NettyResponseStatus status,//`
`89`	`89`	`HttpRequest httpRequest) throws IOException, Exception {`
`90`		`- return !future.isAndSetStatusReceived(true) && handler.onStatusReceived(status) != State.CONTINUE;`
	`90`	`+ return handler.onStatusReceived(status) != State.CONTINUE;`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`private boolean exitAfterHandlingHeaders(//`