From 224bc3a3ad89a76cbe3c8d5128fba87765a74c19 Mon Sep 17 00:00:00 2001
From: Vaci Koblizek <vaci@vaci.org>
Date: Tue, 17 Nov 2020 14:17:56 +0000
Subject: [PATCH] oops, ensure bootstrap uses the questionRef promise

---
 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 b8af7ff..94322ff 100644
--- a/runtime-rpc/src/main/java/org/capnproto/RpcState.java
+++ b/runtime-rpc/src/main/java/org/capnproto/RpcState.java
@@ -376,8 +376,7 @@ final class RpcState<VatId> {
         var question = questions.next();
         question.isAwaitingReturn = true;
         var questionRef = question.selfRef;
-        var promise = new CompletableFuture<RpcResponse>();
-        var pipeline = new RpcPipeline(questionRef, promise);
+        var pipeline = new RpcPipeline(questionRef, questionRef.response);
 
         int sizeHint = messageSizeHint(RpcProtocol.Bootstrap.factory);
         var message = connection.newOutgoingMessage(sizeHint);
@@ -507,7 +506,7 @@ final class RpcState<VatId> {
             return;
         }
 
-        final var answerId = bootstrap.getQuestionId();
+        var answerId = bootstrap.getQuestionId();
         var answer = answers.put(answerId);
         if (answer.active) {
             assert false: "bootstrap questionId is already in use: " + answerId;