Avoid copying BucketState, when you only need BucketInfo.

2 files changed, 3 insertions, 3 deletions

diff --git a/storage/src/vespa/storage/persistence/persistencethread.cpp b/storage/src/vespa/storage/persistence/persistencethread.cpp
index 7d0ce26b83d..dd44c96555b 100644
--- a/storage/src/vespa/storage/persistence/persistencethread.cpp
+++ b/storage/src/vespa/storage/persistence/persistencethread.cpp
@@ -795,8 +795,8 @@ PersistenceThread::handleCommand(api::StorageCommand& msg)
 {
     _context = spi::Context(msg.getLoadType(), msg.getPriority(), msg.getTrace().getLevel());
     MessageTracker::UP mtracker(handleCommandSplitByType(msg));
-    if (mtracker.get() != 0) {
-        if (mtracker->getReply().get() != 0) {
+    if (mtracker) {
+        if (mtracker->getReply()) {
             mtracker->getReply()->getTrace().getRoot().addChild(_context.getTrace().getRoot());
         } else {
             msg.getTrace().getRoot().addChild(_context.getTrace().getRoot());
diff --git a/storage/src/vespa/storage/tools/analyzedistribution.cpp b/storage/src/vespa/storage/tools/analyzedistribution.cpp
index 52c26c4bb17..472aa63fff6 100644
--- a/storage/src/vespa/storage/tools/analyzedistribution.cpp
+++ b/storage/src/vespa/storage/tools/analyzedistribution.cpp
@@ -132,7 +132,7 @@ Node::Node(const lib::NodeState& dstate, const lib::NodeState& sstate, uint32_t
         disks.push_back(Disk(storageState.getDiskState(i)));
     }
 }
-Node::~Node() {}
+Node::~Node() = default;
 
 struct Distribution {
     std::vector<Node> nodes;