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

avoid null bootstrap interface

Browse source
This commit is contained in:
Vaci Koblizek 2020-11-19 15:32:32 +00:00
parent 68edac583b
commit f0fbaacae1
1 changed files with 7 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
runtime-rpc/src/main/java/org/capnproto/RpcSystem.java
View file

@ -1,9 +1,5 @@
package org.capnproto; package org.capnproto;
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
@ -15,7 +11,8 @@ public class RpcSystem<VatId extends StructReader> {
private final Map<VatNetwork.Connection<VatId>, RpcState<VatId>> connections = new ConcurrentHashMap<>(); private final Map<VatNetwork.Connection<VatId>, RpcState<VatId>> connections = new ConcurrentHashMap<>();
public RpcSystem(VatNetwork<VatId> network) { public RpcSystem(VatNetwork<VatId> network) {
this(network, (BootstrapFactory<VatId>)null); this(network, clientId -> new Capability.Client(
Capability.newBrokenCap("No bootstrap interface available")));
} }
public RpcSystem(VatNetwork<VatId> network, public RpcSystem(VatNetwork<VatId> network,
@ -25,12 +22,7 @@ public class RpcSystem<VatId extends StructReader> {
public RpcSystem(VatNetwork<VatId> network, public RpcSystem(VatNetwork<VatId> network,
Capability.Client bootstrapInterface) { Capability.Client bootstrapInterface) {
this(network, new BootstrapFactory<VatId>() { this(network, clientId -> bootstrapInterface);
@Override
public Capability.Client createFor(VatId clientId) {
return bootstrapInterface;
}
});
} }
public RpcSystem(VatNetwork<VatId> network, public RpcSystem(VatNetwork<VatId> network,
@ -47,19 +39,16 @@ public class RpcSystem<VatId extends StructReader> {
var hook = state.restore(); var hook = state.restore();
return new Capability.Client(hook); return new Capability.Client(hook);
} }
else if (this.bootstrapFactory != null) { else {
return this.bootstrapFactory.createFor(vatId); return this.bootstrapFactory.createFor(vatId);
} }
else {
return new Capability.Client(Capability.newBrokenCap("No bootstrap interface available"));
}
} }
public VatNetwork<VatId> getNetwork() { public void accept(VatNetwork.Connection<VatId> connection) {
return this.network; getConnectionState(connection);
} }
RpcState<VatId> getConnectionState(VatNetwork.Connection<VatId> connection) { private RpcState<VatId> getConnectionState(VatNetwork.Connection<VatId> connection) {
return this.connections.computeIfAbsent(connection, conn -> { return this.connections.computeIfAbsent(connection, conn -> {
var onDisconnect = new CompletableFuture<RpcState.DisconnectInfo>(); var onDisconnect = new CompletableFuture<RpcState.DisconnectInfo>();
onDisconnect.thenCompose(info -> { onDisconnect.thenCompose(info -> {
@ -70,10 +59,6 @@ public class RpcSystem<VatId extends StructReader> {
}); });
} }
public void accept(VatNetwork.Connection<VatId> connection) {
getConnectionState(connection);
}
private void startAcceptLoop() { private void startAcceptLoop() {
this.network.accept() this.network.accept()
.thenAccept(this::accept) .thenAccept(this::accept)