From 94ca2a04e689e8d3cf265f0b8d44c4c625111922 Mon Sep 17 00:00:00 2001 From: Vaci Koblizek Date: Sat, 24 Oct 2020 16:48:52 +0100 Subject: [PATCH] remove sync modifier from getConnectionState and tidy --- runtime/src/main/java/org/capnproto/RpcSystem.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/runtime/src/main/java/org/capnproto/RpcSystem.java b/runtime/src/main/java/org/capnproto/RpcSystem.java index 7fe1f44..4e31205 100644 --- a/runtime/src/main/java/org/capnproto/RpcSystem.java +++ b/runtime/src/main/java/org/capnproto/RpcSystem.java @@ -31,11 +31,12 @@ public abstract class RpcSystem { getConnectionState(connection); } - synchronized RpcState getConnectionState(VatNetwork.Connection connection) { + RpcState getConnectionState(VatNetwork.Connection connection) { - var onDisconnect = new CompletableFuture().thenAccept(lostConnection -> { - this.connections.remove(lostConnection); - }); + var onDisconnect = new CompletableFuture() + .thenAccept(lostConnection -> { + this.connections.remove(lostConnection); + }); return connections.computeIfAbsent(connection, key -> new RpcState(bootstrapInterface, connection, onDisconnect)); @@ -50,7 +51,7 @@ public abstract class RpcSystem { private CompletableFuture doMessageLoop() { var accept = this.getAcceptLoop(); - for (var conn : connections.values()) { + for (var conn: this.connections.values()) { accept = accept.acceptEither(conn.getMessageLoop(), x -> {}); } return accept.thenCompose(x -> this.doMessageLoop());