Reverse order of closing and completing the promise

May fix bazelbuild#7464.
ulfjack · Feb 22, 2019 · d670b7c · d670b7c
1 parent 800e7f2
commit d670b7c
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 28 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/remote/blobstore/http/HttpDownloadHandler.java b/src/main/java/com/google/devtools/build/lib/remote/blobstore/http/HttpDownloadHandler.java
@@ -17,6 +17,7 @@
 
 import com.google.auth.Credentials;
 import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelPromise;
 import io.netty.handler.codec.http.DefaultFullHttpRequest;
@@ -164,41 +165,31 @@ private HttpRequest buildRequest(String path, String host) {
   }
 
   private void succeedAndReset(ChannelHandlerContext ctx) {
-    try {
+    if (keepAlive) {
       succeedAndResetUserPromise();
-    } finally {
-      reset(ctx);
+    } else {
+      reset(ctx).addListener((f) -> succeedAndResetUserPromise());
     }
   }
 
   @SuppressWarnings("FutureReturnValueIgnored")
   private void failAndClose(Throwable t, ChannelHandlerContext ctx) {
-    try {
-      failAndResetUserPromise(t);
-    } finally {
-      ctx.close();
-    }
+    ctx.close().addListener((f) -> failAndResetUserPromise(t));
   }
 
   private void failAndReset(Throwable t, ChannelHandlerContext ctx) {
-    try {
+    if (keepAlive) {
       failAndResetUserPromise(t);
-    } finally {
-      reset(ctx);
+    } else {
+      reset(ctx).addListener((f) -> failAndResetUserPromise(t));
     }
   }
 
-  @SuppressWarnings("FutureReturnValueIgnored")
-  private void reset(ChannelHandlerContext ctx) {
-    try {
-      if (!keepAlive) {
-        ctx.close();
-      }
-    } finally {
-      out = null;
-      keepAlive = HttpVersion.HTTP_1_1.isKeepAliveDefault();
-      downloadSucceeded = false;
-      response = null;
-    }
+  private ChannelFuture reset(ChannelHandlerContext ctx) {
+    out = null;
+    keepAlive = HttpVersion.HTTP_1_1.isKeepAliveDefault();
+    downloadSucceeded = false;
+    response = null;
+    return ctx.close();
   }
 }
diff --git a/src/main/java/com/google/devtools/build/lib/remote/blobstore/http/HttpUploadHandler.java b/src/main/java/com/google/devtools/build/lib/remote/blobstore/http/HttpUploadHandler.java
@@ -122,10 +122,6 @@ private HttpChunkedInput buildBody(UploadCommand msg) {
 
   @SuppressWarnings("FutureReturnValueIgnored")
   private void failAndClose(Throwable t, ChannelHandlerContext ctx) {
-    try {
-      failAndResetUserPromise(t);
-    } finally {
-      ctx.close();
-    }
+    ctx.close().addListener((f) -> failAndResetUserPromise(t));
   }
 }