diff options
Diffstat (limited to 'messagebus')
| -rw-r--r-- | messagebus/abi-spec.json | 2 | ||||
| -rw-r--r-- | messagebus/src/vespa/messagebus/network/rpctarget.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/messagebus/abi-spec.json b/messagebus/abi-spec.json index 4bec4bd91fe..f3e7c5664d6 100644 --- a/messagebus/abi-spec.json +++ b/messagebus/abi-spec.json @@ -398,6 +398,8 @@ "public final java.lang.String getDefMd5()", "public final java.lang.String getDefName()", "public final java.lang.String getDefNamespace()", + "public final boolean getApplyOnRestart()", + "public final void setApplyOnRestart(boolean)", "public com.yahoo.messagebus.MessagebusConfig build()" ], "fields": [ diff --git a/messagebus/src/vespa/messagebus/network/rpctarget.cpp b/messagebus/src/vespa/messagebus/network/rpctarget.cpp index b91ba43f036..159b86365c3 100644 --- a/messagebus/src/vespa/messagebus/network/rpctarget.cpp +++ b/messagebus/src/vespa/messagebus/network/rpctarget.cpp @@ -32,7 +32,7 @@ RPCTarget::resolveVersion(duration timeout, RPCTarget::IVersionHandler &handler) std::unique_lock guard(_lock); state = _state.load(std::memory_order_relaxed); if (state == VERSION_RESOLVED || state == PROCESSING_HANDLERS) { - while (_state.load(std::memory_order::memory_order_relaxed) == PROCESSING_HANDLERS) { + while (_state.load(std::memory_order_relaxed) == PROCESSING_HANDLERS) { _cond.wait(guard); } hasVersion = true; |