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

simplify server runOnce

Browse source
This commit is contained in:
Vaci Koblizek 2020-10-14 15:54:21 +01:00
parent 61c98ac266
commit 89451874c3
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
runtime/src/main/java/org/capnproto/TwoPartyClient.java
View file

@ -32,7 +32,7 @@ public class TwoPartyClient {
return rpcSystem.bootstrap(vatId.asReader()); return rpcSystem.bootstrap(vatId.asReader());
} }
public synchronized CompletableFuture<?> runOnce() { public CompletableFuture<?> runOnce() {
return this.rpcSystem.runOnce(); return this.rpcSystem.runOnce();
} }
} }

2
runtime/src/main/java/org/capnproto/TwoPartyServer.java
View file

@ -55,7 +55,7 @@ public class TwoPartyServer {
} }
public synchronized CompletableFuture<?> runOnce() { public synchronized CompletableFuture<?> runOnce() {
var done = new CompletableFuture<Object>(); var done = new CompletableFuture<>();
for (var conn: connections) { for (var conn: connections) {
done = CompletableFuture.anyOf(done, conn.runOnce()); done = CompletableFuture.anyOf(done, conn.runOnce());
} }

4
runtime/src/test/java/org/capnproto/TwoPartyTest.java
View file

@ -83,7 +83,7 @@ public class TwoPartyTest {
params.setParam0(4321); params.setParam0(4321);
var response = request.send(); var response = request.send();
while (!response.isDone()) { while (!response.isDone()) {
CompletableFuture.anyOf(response, server.runOnce()).join(); CompletableFuture.anyOf(response, this.client.runOnce(), server.runOnce()).join();
} }
Assert.assertTrue(response.isDone()); Assert.assertTrue(response.isDone());
var results = response.get(); var results = response.get();
@ -101,7 +101,7 @@ public class TwoPartyTest {
var params = request.getParams(); var params = request.getParams();
var response = request.send(); var response = request.send();
while (!response.isDone()) { while (!response.isDone()) {
CompletableFuture.anyOf(response, server.runOnce()).join(); CompletableFuture.anyOf(response, this.client.runOnce(), server.runOnce()).join();
} }
Assert.assertTrue(response.isDone()); Assert.assertTrue(response.isDone());