No reason to fake history to simulate a faster moving clock.

2 files changed, 2 insertions, 4 deletions

diff --git a/messagebus/src/vespa/messagebus/network/rpcnetwork.cpp b/messagebus/src/vespa/messagebus/network/rpcnetwork.cpp
index fae8d73d540..f3e3359fabe 100644
--- a/messagebus/src/vespa/messagebus/network/rpcnetwork.cpp
+++ b/messagebus/src/vespa/messagebus/network/rpcnetwork.cpp
@@ -326,7 +326,6 @@ RPCNetwork::send(const Message &msg, const std::vector<RoutingNode*> &recipients
     double timeout = ctx._msg.getTimeRemainingNow() / 1000.0;
     for (uint32_t i = 0, len = ctx._recipients.size(); i < len; ++i) {
         RoutingNode *&recipient = ctx._recipients[i];
-        LOG_ASSERT(recipient != nullptr);
 
         RPCServiceAddress &address = static_cast<RPCServiceAddress&>(recipient->getServiceAddress());
         LOG_ASSERT(address.hasTarget());
@@ -348,8 +347,7 @@ RPCNetwork::send(RPCNetwork::SendContext &ctx)
             replyError(ctx, ErrorCode::INCOMPATIBLE_VERSION,
                        make_string("Can not send to version '%s' recipient.", ctx._version.toString().c_str()));
         } else if (timeRemaining == 0) {
-            replyError(ctx, ErrorCode::TIMEOUT,
-                       "Aborting transmission because zero time remains.");
+            replyError(ctx, ErrorCode::TIMEOUT, "Aborting transmission because zero time remains.");
         } else if (payload.size() == 0) {
             replyError(ctx, ErrorCode::ENCODE_ERROR,
                        make_string("Protocol '%s' failed to encode message.", ctx._msg.getProtocol().c_str()));
diff --git a/messagebus/src/vespa/messagebus/network/rpctargetpool.cpp b/messagebus/src/vespa/messagebus/network/rpctargetpool.cpp
index 295814f4a8d..6dca636cad2 100644
--- a/messagebus/src/vespa/messagebus/network/rpctargetpool.cpp
+++ b/messagebus/src/vespa/messagebus/network/rpctargetpool.cpp
@@ -43,7 +43,7 @@ RPCTargetPool::flushTargets(bool force)
                 continue; // someone is using this
             }
             if (!force) {
-                if (--entry._lastUse + _expireMillis > currentTime) {
+                if (entry._lastUse + _expireMillis > currentTime) {
                     ++it;
                     continue; // not sufficiently idle
                 }