From 3ba96956a88d609c66461dd4494c0334ec78ebaa Mon Sep 17 00:00:00 2001
From: Vaci Koblizek <vaci@vaci.org>
Date: Thu, 26 Nov 2020 14:44:38 +0000
Subject: [PATCH] disembargo promise is always non-null

---
 runtime-rpc/src/main/java/org/capnproto/RpcState.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/runtime-rpc/src/main/java/org/capnproto/RpcState.java b/runtime-rpc/src/main/java/org/capnproto/RpcState.java
index ad3fc9c..3582b70 100644
--- a/runtime-rpc/src/main/java/org/capnproto/RpcState.java
+++ b/runtime-rpc/src/main/java/org/capnproto/RpcState.java
@@ -205,6 +205,7 @@ final class RpcState<VatId> {
     final static class Embargo {
         final int id;
         final CompletableFuture<java.lang.Void> disembargo = new CompletableFuture<>();
+
         Embargo(int id) {
             this.id = id;
         }
@@ -320,9 +321,7 @@ final class RpcState<VatId> {
         }
 
         for (var embargo: embargos) {
-            if (embargo.disembargo != null) {
-                embargo.disembargo.completeExceptionally(networkExc);
-            }
+            embargo.disembargo.completeExceptionally(networkExc);
         }
 
         // Send an abort message, but ignore failure.