diff options
author | Jon Marius Venstad <venstad@gmail.com> | 2020-09-25 10:37:50 +0200 |
---|---|---|
committer | Jon Marius Venstad <venstad@gmail.com> | 2020-09-25 10:37:50 +0200 |
commit | 17c6dc3a23badb17f468fe8b38bda57eab717a4c (patch) | |
tree | 9f8c1b332df340051dc7f2cff1caca3e5d804d2b /documentapi/src/main/java | |
parent | f6d6f0db9f6dab4a48aea33dd8c41b28ff624ad5 (diff) |
Eliminate config self-subscription from MessageBusDocumentAccess
Diffstat (limited to 'documentapi/src/main/java')
-rw-r--r-- | documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusDocumentAccess.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusDocumentAccess.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusDocumentAccess.java index c60cd9cc378..3e35e9bd12a 100644 --- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusDocumentAccess.java +++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusDocumentAccess.java @@ -60,7 +60,9 @@ public class MessageBusDocumentAccess extends DocumentAccess { bus = new NetworkMessageBus(network, new MessageBus(network, mbusParams)); } else { - bus = new RPCMessageBus(mbusParams, params.getRPCNetworkParams(), params.getRoutingConfigId()); + bus = params.getRPCNetworkParams().getSlobroksConfig() != null && mbusParams.getMessageBusConfig() != null + ? new RPCMessageBus(mbusParams, params.getRPCNetworkParams()) // prefer without self-subscription if config is set + : new RPCMessageBus(mbusParams, params.getRPCNetworkParams(), params.getRoutingConfigId()); } } catch (Exception e) { |