From 8457c38623f5660d0d63a5ce2a4a0ce3325d9723 Mon Sep 17 00:00:00 2001
From: Vaci Koblizek <vaci@vaci.org>
Date: Sun, 8 Nov 2020 21:08:19 +0000
Subject: [PATCH] fix null exportId bug

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

diff --git a/runtime-rpc/src/main/java/org/capnproto/RpcState.java b/runtime-rpc/src/main/java/org/capnproto/RpcState.java
index 0eb4fb5..4791c87 100644
--- a/runtime-rpc/src/main/java/org/capnproto/RpcState.java
+++ b/runtime-rpc/src/main/java/org/capnproto/RpcState.java
@@ -870,7 +870,9 @@ final class RpcState<VatId> {
             }
 
             var exportId = writeDescriptor(cap, capTableBuilder.get(ii), fds);
-            exports.add(exportId);
+            if (exportId != null) {
+                exports.add(exportId);
+            }
         }
 
         return exports.stream()
@@ -878,7 +880,7 @@ final class RpcState<VatId> {
                 .toArray();
     }
 
-    private int writeDescriptor(ClientHook cap, RpcProtocol.CapDescriptor.Builder descriptor, List<Integer> fds) {
+    private Integer writeDescriptor(ClientHook cap, RpcProtocol.CapDescriptor.Builder descriptor, List<Integer> fds) {
         ClientHook inner = cap;
         for (;;) {
             var resolved = inner.getResolved();