commit 419cb4a4f8d6aaaeb2684ca082357f717757b607
author Jakob Buchgraber <buchgr@google.com> Tue Apr 10 04:56:25 2018 -0700
committer Philipp Wollermann <philwo@google.com> Wed Apr 11 16:40:17 2018 +0200
tree f6f5c0b7b1dc515dc32fa0695c9579dadff29711
parent 2f15483a5eb4fb25c504c4760aa70936beda226d

remote/http: properly complete user promise

Fixes #4976, #4935

Closes #4991.

PiperOrigin-RevId: 192269206

src/main/java/com/google/devtools/build/lib/remote/blobstore/http/AbstractHttpHandler.java

diff --git a/src/main/java/com/google/devtools/build/lib/remote/blobstore/http/AbstractHttpHandler.java b/src/main/java/com/google/devtools/build/lib/remote/blobstore/http/AbstractHttpHandler.java
index 0c4c8e2..c9cdd0c 100644
--- a/src/main/java/com/google/devtools/build/lib/remote/blobstore/http/AbstractHttpHandler.java
+++ b/src/main/java/com/google/devtools/build/lib/remote/blobstore/http/AbstractHttpHandler.java
@@ -94,8 +94,9 @@
   }
 
   @Override
-  public void exceptionCaught(ChannelHandlerContext channelHandlerContext, Throwable throwable) {
-    failAndResetUserPromise(throwable);
+  public void exceptionCaught(ChannelHandlerContext ctx, Throwable t) {
+    failAndResetUserPromise(t);
+    ctx.fireExceptionCaught(t);
   }
 
   @SuppressWarnings("FutureReturnValueIgnored")
@@ -131,6 +132,7 @@
   @SuppressWarnings("FutureReturnValueIgnored")
   @Override
   public void deregister(ChannelHandlerContext ctx, ChannelPromise promise) {
+    failAndResetUserPromise(new ClosedChannelException());
     ctx.deregister(promise);
   }
 
@@ -147,8 +149,19 @@
   }
 
   @Override
-  public void channelInactive(ChannelHandlerContext channelHandlerContext) throws Exception {
+  public void channelInactive(ChannelHandlerContext ctx) {
     failAndResetUserPromise(new ClosedChannelException());
-    super.channelInactive(channelHandlerContext);
+    ctx.fireChannelInactive();
+  }
+
+  @Override
+  public void handlerRemoved(ChannelHandlerContext ctx) {
+    failAndResetUserPromise(new IOException("handler removed"));
+  }
+
+  @Override
+  public void channelUnregistered(ChannelHandlerContext ctx) {
+    failAndResetUserPromise(new ClosedChannelException());
+    ctx.fireChannelUnregistered();
   }
 }