summaryrefslogtreecommitdiffstats
path: root/messagebus
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@oath.com>2018-03-22 23:44:17 +0100
committerHenning Baldersheim <balder@oath.com>2018-04-03 18:33:28 +0200
commit8c80fadcafb2d600ae72d01f5e2034a3ed8df670 (patch)
tree94f5e8cfceaf417f1a0b3cf0da25b7089eb5c5af /messagebus
parent2efcbf7038eb951c140e9aacd32105772c5d8ddb (diff)
Use move constructors.
Diffstat (limited to 'messagebus')
-rw-r--r--messagebus/src/vespa/messagebus/routing/routingnode.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/messagebus/src/vespa/messagebus/routing/routingnode.cpp b/messagebus/src/vespa/messagebus/routing/routingnode.cpp
index fc0845e5316..b5b99ea43c2 100644
--- a/messagebus/src/vespa/messagebus/routing/routingnode.cpp
+++ b/messagebus/src/vespa/messagebus/routing/routingnode.cpp
@@ -174,7 +174,7 @@ RoutingNode::addError(uint32_t code, const string &msg)
void
RoutingNode::addError(const Error &err)
{
- if (_reply.get() != nullptr) {
+ if (_reply) {
_reply->getTrace().swap(_trace);
_reply->addError(err);
_reply->getTrace().swap(_trace);
@@ -186,9 +186,9 @@ RoutingNode::addError(const Error &err)
void
RoutingNode::setReply(Reply::UP reply)
{
- if (reply.get() != nullptr) {
+ if (reply) {
_shouldRetry = _resender != nullptr && _resender->shouldRetry(*reply);
- _trace.getRoot().addChild(reply->getTrace().getRoot());
+ _trace.getRoot().addChild(std::move(reply->getTrace().getRoot()));
reply->getTrace().clear();
}
_reply = std::move(reply);