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

ensure whenMoreResolved resolves to eventual client in PromiseClient

Browse source
This commit is contained in:
Vaci Koblizek 2020-11-19 16:19:34 +00:00
parent af229ccb99
commit 0c4e98848e
1 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1824,13 +1824,11 @@ final class RpcState<VatId> {
Integer importId) { Integer importId) {
this.cap = initial; this.cap = initial;
this.importId = importId; this.importId = importId;
this.eventual = eventual.whenComplete((resolution, exc) -> { this.eventual = eventual.handle((resolution, exc) -> {
if (exc == null) { this.cap = exc == null
this.resolve(resolution); ? this.resolve(resolution)
} : this.resolve(Capability.newBrokenCap(exc));
else { return this.cap;
this.resolve(Capability.newBrokenCap(exc));
}
}); });
} }
@ -1954,15 +1952,15 @@ final class RpcState<VatId> {
ClientHook finalReplacement = replacement; ClientHook finalReplacement = replacement;
var embargoPromise = embargo.disembargo.thenApply( var embargoPromise = embargo.disembargo.thenApply(
void_ -> finalReplacement); void_ -> finalReplacement);
replacement = Capability.newLocalPromiseClient(embargoPromise);
LOGGER.info(() -> RpcState.this.toString() + ": > DISEMBARGO"); LOGGER.info(() -> RpcState.this.toString() + ": > DISEMBARGO");
message.send(); message.send();
return Capability.newLocalPromiseClient(embargoPromise);
} }
else {
this.cap = replacement;
return replacement; return replacement;
} }
} }
}
private class PipelineClient extends RpcClient { private class PipelineClient extends RpcClient {