From 9d1cf63bf3c13655ae6975f062b2bea45bc74b02 Mon Sep 17 00:00:00 2001 From: Jon Marius Venstad Date: Thu, 26 Aug 2021 21:50:42 +0200 Subject: Use self-subscription for slobroks config in container messagebus --- .../container/jdisc/messagebus/NetworkMultiplexerHolder.java | 4 +++- .../jdisc/messagebus/NetworkMultiplexerProvider.java | 12 ++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) (limited to 'container-messagebus') diff --git a/container-messagebus/src/main/java/com/yahoo/container/jdisc/messagebus/NetworkMultiplexerHolder.java b/container-messagebus/src/main/java/com/yahoo/container/jdisc/messagebus/NetworkMultiplexerHolder.java index 9020bfaffe3..3c465835589 100644 --- a/container-messagebus/src/main/java/com/yahoo/container/jdisc/messagebus/NetworkMultiplexerHolder.java +++ b/container-messagebus/src/main/java/com/yahoo/container/jdisc/messagebus/NetworkMultiplexerHolder.java @@ -30,7 +30,9 @@ public class NetworkMultiplexerHolder extends AbstractComponent { } private Network newNetwork(RPCNetworkParams params) { - return params.getSlobroksConfig().slobrok().isEmpty() ? new NullNetwork() : new RPCNetwork(params); + return params.getSlobroksConfig() != null && params.getSlobroksConfig().slobrok().isEmpty() + ? new NullNetwork() // For LocalApplication, test setup. + : new RPCNetwork(params); } @Override diff --git a/container-messagebus/src/main/java/com/yahoo/container/jdisc/messagebus/NetworkMultiplexerProvider.java b/container-messagebus/src/main/java/com/yahoo/container/jdisc/messagebus/NetworkMultiplexerProvider.java index 650ac92e779..a99ec27656c 100644 --- a/container-messagebus/src/main/java/com/yahoo/container/jdisc/messagebus/NetworkMultiplexerProvider.java +++ b/container-messagebus/src/main/java/com/yahoo/container/jdisc/messagebus/NetworkMultiplexerProvider.java @@ -21,16 +21,16 @@ public class NetworkMultiplexerProvider { private final NetworkMultiplexer net; @Inject - public NetworkMultiplexerProvider(NetworkMultiplexerHolder net, ContainerMbusConfig mbusConfig, SlobroksConfig slobroksConfig) { - this(net, mbusConfig, slobroksConfig, System.getProperty("config.id")); //: + public NetworkMultiplexerProvider(NetworkMultiplexerHolder net, ContainerMbusConfig mbusConfig) { + this(net, mbusConfig, System.getProperty("config.id")); //: } - public NetworkMultiplexerProvider(NetworkMultiplexerHolder net, ContainerMbusConfig mbusConfig, SlobroksConfig slobroksConfig, String identity) { - this.net = net.get(asParameters(mbusConfig, slobroksConfig, identity)); + public NetworkMultiplexerProvider(NetworkMultiplexerHolder net, ContainerMbusConfig mbusConfig, String identity) { + this.net = net.get(asParameters(mbusConfig, identity)); } - public static RPCNetworkParams asParameters(ContainerMbusConfig mbusConfig, SlobroksConfig slobroksConfig, String identity) { - return new RPCNetworkParams().setSlobroksConfig(slobroksConfig) + public static RPCNetworkParams asParameters(ContainerMbusConfig mbusConfig, String identity) { + return new RPCNetworkParams().setSlobrokConfigId(identity) .setIdentity(new Identity(identity)) .setListenPort(mbusConfig.port()) .setNumTargetsPerSpec(mbusConfig.numconnectionspertarget()) -- cgit v1.2.3