serverscanning/capnproto-java-rpc
16
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix null exportId bug

Browse source
This commit is contained in:
Vaci Koblizek 2020-11-08 21:08:19 +00:00
parent 59c8f648ec
commit 8457c38623
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
runtime-rpc/src/main/java/org/capnproto/RpcState.java
View file

@ -870,7 +870,9 @@ final class RpcState<VatId> {
} }
var exportId = writeDescriptor(cap, capTableBuilder.get(ii), fds); var exportId = writeDescriptor(cap, capTableBuilder.get(ii), fds);
exports.add(exportId); if (exportId != null) {
exports.add(exportId);
}
} }
return exports.stream() return exports.stream()
@ -878,7 +880,7 @@ final class RpcState<VatId> {
.toArray(); .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; ClientHook inner = cap;
for (;;) { for (;;) {
var resolved = inner.getResolved(); var resolved = inner.getResolved();