diff options
Diffstat (limited to 'documentapi')
-rw-r--r-- | documentapi/src/vespa/documentapi/messagebus/policies/externpolicy.cpp | 9 | ||||
-rw-r--r-- | documentapi/src/vespa/documentapi/messagebus/policies/externslobrokpolicy.cpp | 4 |
2 files changed, 7 insertions, 6 deletions
diff --git a/documentapi/src/vespa/documentapi/messagebus/policies/externpolicy.cpp b/documentapi/src/vespa/documentapi/messagebus/policies/externpolicy.cpp index 25112a00b99..312cd2d89cb 100644 --- a/documentapi/src/vespa/documentapi/messagebus/policies/externpolicy.cpp +++ b/documentapi/src/vespa/documentapi/messagebus/policies/externpolicy.cpp @@ -2,10 +2,11 @@ #include "externpolicy.h" #include <boost/tokenizer.hpp> #include <vespa/documentapi/messagebus/documentprotocol.h> -#include <vespa/messagebus/emptyreply.h> #include <vespa/vespalib/util/stringfmt.h> #include <vespa/slobrok/sbmirror.h> -#include <vespa/fnet/frt/frt.h> +#include <vespa/fnet/transport.h> +#include <vespa/fnet/frt/supervisor.h> +#include <vespa/fastos/thread.h> #include <vespa/log/log.h> LOG_SETUP(".externpolicy"); @@ -52,13 +53,13 @@ ExternPolicy::ExternPolicy(const string ¶m) : spec.push_back(*it); } - if (spec.size() == 0) { + if (spec.empty()) { _error = vespalib::make_string("Extern policy needs at least one slobrok: Slobrok list '%s' resolved to no slobroks", lst.c_str()); return; } slobrok::ConfiguratorFactory config(spec); - _mirror.reset(new MirrorAPI(*_orb, config)); + _mirror = std::make_unique<MirrorAPI>(*_orb, config); _started = _transport->Start(_threadPool.get()); if (!_started) { _error = "Failed to start FNET supervisor."; diff --git a/documentapi/src/vespa/documentapi/messagebus/policies/externslobrokpolicy.cpp b/documentapi/src/vespa/documentapi/messagebus/policies/externslobrokpolicy.cpp index 800aa8c4520..9eb28432234 100644 --- a/documentapi/src/vespa/documentapi/messagebus/policies/externslobrokpolicy.cpp +++ b/documentapi/src/vespa/documentapi/messagebus/policies/externslobrokpolicy.cpp @@ -4,10 +4,10 @@ #include <vespa/messagebus/routing/routingcontext.h> #include <vespa/config/common/configcontext.h> #include <vespa/vespalib/text/stringtokenizer.h> -#include <vespa/vespalib/util/time.h> -#include <vespa/fnet/frt/frt.h> #include <vespa/slobrok/sbmirror.h> +#include <vespa/fnet/frt/supervisor.h> #include <vespa/fnet/transport.h> +#include <vespa/fastos/thread.h> #include <thread> using slobrok::api::IMirrorAPI; |