std::move

3 files changed, 5 insertions, 4 deletions

diff --git a/messagebus/src/vespa/messagebus/network/rpcnetwork.cpp b/messagebus/src/vespa/messagebus/network/rpcnetwork.cpp
index c6f61b383bc..4e8e5bdd7dd 100644
--- a/messagebus/src/vespa/messagebus/network/rpcnetwork.cpp
+++ b/messagebus/src/vespa/messagebus/network/rpcnetwork.cpp
@@ -130,6 +130,7 @@ RPCNetwork::RPCNetwork(const RPCNetworkParams &params) :
 {
     _transport->SetMaxInputBufferSize(params.getMaxInputBufferSize());
     _transport->SetMaxOutputBufferSize(params.getMaxOutputBufferSize());
+    _transport->SetTCPNoDelay(false);
 }
 
 RPCNetwork::~RPCNetwork()
@@ -306,8 +307,8 @@ RPCNetwork::resolveServiceAddress(RoutingNode &recipient, const string &serviceN
                      make_string("Failed to connect to service '%s' from host '%s'.",
                                  serviceName.c_str(), getIdentity().getHostname().c_str()));
     }
-    ret->setTarget(target); // free by freeServiceAddress()
-    recipient.setServiceAddress(IServiceAddress::UP(ret.release()));
+    ret->setTarget(std::move(target)); // free by freeServiceAddress()
+    recipient.setServiceAddress(std::move(ret));
     return Error();
 }
 
diff --git a/messagebus/src/vespa/messagebus/network/rpcserviceaddress.h b/messagebus/src/vespa/messagebus/network/rpcserviceaddress.h
index 36dde19bd18..142e654cc06 100644
--- a/messagebus/src/vespa/messagebus/network/rpcserviceaddress.h
+++ b/messagebus/src/vespa/messagebus/network/rpcserviceaddress.h
@@ -84,7 +84,7 @@ public:
      *
      * @return True if target is set.
      */
-    bool hasTarget() const { return _target.get() != nullptr; }
+    bool hasTarget() const { return bool(_target); }
 };
 
 } // namespace mbus
diff --git a/messagebus/src/vespa/messagebus/network/rpctargetpool.cpp b/messagebus/src/vespa/messagebus/network/rpctargetpool.cpp
index 7fcc214faa7..dd977efec08 100644
--- a/messagebus/src/vespa/messagebus/network/rpctargetpool.cpp
+++ b/messagebus/src/vespa/messagebus/network/rpctargetpool.cpp
@@ -74,7 +74,7 @@ RPCTargetPool::getTarget(FRT_Supervisor &orb, const RPCServiceAddress &address)
         }
         _targets.erase(it);
     }
-    RPCTarget::SP ret(new RPCTarget(spec, orb));
+    auto ret = std::make_shared<RPCTarget>(spec, orb);
     _targets.insert(TargetMap::value_type(spec, Entry(ret, _timer->getMilliTime())));
     return ret;
 }