aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2019-05-10 17:48:47 +0000
committerHenning Baldersheim <balder@yahoo-inc.com>2019-05-10 17:48:47 +0000
commit730ec552efe8f558e2cde63c76b78f1cc39db864 (patch)
tree0bf0d8e974dc15efb989a22d77699d6f5329045c /config
parentb686272de1bc25f6af8a094d7acff2c32fc51cbd (diff)
Simplify by not caching a member
Diffstat (limited to 'config')
-rw-r--r--config/src/apps/vespa-configproxy-cmd/proxycmd.cpp11
1 files changed, 3 insertions, 8 deletions
diff --git a/config/src/apps/vespa-configproxy-cmd/proxycmd.cpp b/config/src/apps/vespa-configproxy-cmd/proxycmd.cpp
index ce0665eae4a..e704bf1e4f7 100644
--- a/config/src/apps/vespa-configproxy-cmd/proxycmd.cpp
+++ b/config/src/apps/vespa-configproxy-cmd/proxycmd.cpp
@@ -20,7 +20,6 @@ Flags::~Flags() = default;
ProxyCmd::ProxyCmd(const Flags& flags)
: _server(),
- _supervisor(nullptr),
_target(nullptr),
_req(nullptr),
_flags(flags)
@@ -30,8 +29,7 @@ ProxyCmd::~ProxyCmd() = default;
void ProxyCmd::initRPC() {
_server = std::make_unique<fnet::frt::StandaloneFRT>();
- _supervisor = &_server->supervisor();
- _req = _supervisor->AllocRPCRequest();
+ _req = _server->supervisor().AllocRPCRequest();
}
void ProxyCmd::invokeRPC() {
@@ -48,10 +46,7 @@ void ProxyCmd::finiRPC() {
_target->SubRef();
_target = NULL;
}
- if (_server) {
- _server.reset();
- _supervisor = nullptr;
- }
+ _server.reset();
}
void ProxyCmd::printArray(FRT_Values *rvals) {
@@ -87,7 +82,7 @@ int ProxyCmd::action() {
int errors = 0;
initRPC();
vespalib::string spec = makeSpec();
- _target = _supervisor->GetTarget(spec.c_str());
+ _target = _server->supervisor().GetTarget(spec.c_str());
_req->SetMethodName(_flags.method.c_str());
FRT_Values &params = *_req->GetParams();
for (size_t i = 0; i < _flags.args.size(); ++i) {