diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2020-11-17 23:48:20 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2020-11-18 18:22:16 +0000 |
commit | b2d2d0053d16ca15c9298f3e8312b494e246c5e9 (patch) | |
tree | 6a9670dae20080e9a59eca882962c4ced94e9640 /storageapi/src | |
parent | d6975953e4284068fbd76e80bbf7e802003adcaf (diff) |
No need to copy an empty object into another empty object.
Diffstat (limited to 'storageapi/src')
-rw-r--r-- | storageapi/src/vespa/storageapi/messageapi/storagecommand.cpp | 6 | ||||
-rw-r--r-- | storageapi/src/vespa/storageapi/messageapi/storagereply.cpp | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/storageapi/src/vespa/storageapi/messageapi/storagecommand.cpp b/storageapi/src/vespa/storageapi/messageapi/storagecommand.cpp index d9bbf34141a..3e886ac872e 100644 --- a/storageapi/src/vespa/storageapi/messageapi/storagecommand.cpp +++ b/storageapi/src/vespa/storageapi/messageapi/storagecommand.cpp @@ -11,7 +11,11 @@ StorageCommand::StorageCommand(const StorageCommand& other) _timeout(other._timeout), _sourceIndex(other._sourceIndex) { - setTrace(other.getTrace()); + if ( !other.getTrace().isEmpty()) { + setTrace(other.getTrace()); + } else { + getTrace().setLevel(other.getTrace().getLevel()); + } } StorageCommand::StorageCommand(const MessageType& type, Priority p) diff --git a/storageapi/src/vespa/storageapi/messageapi/storagereply.cpp b/storageapi/src/vespa/storageapi/messageapi/storagereply.cpp index 81cdadb3623..57dab64e0bd 100644 --- a/storageapi/src/vespa/storageapi/messageapi/storagereply.cpp +++ b/storageapi/src/vespa/storageapi/messageapi/storagereply.cpp @@ -14,7 +14,11 @@ StorageReply::StorageReply(const StorageCommand& cmd, ReturnCode code) if (cmd.getAddress()) { setAddress(*cmd.getAddress()); } - setTrace(cmd.getTrace()); + if ( ! cmd.getTrace().isEmpty()) { + setTrace(cmd.getTrace()); + } else { + getTrace().setLevel(cmd.getTrace().getLevel()); + } setTransportContext(cmd.getTransportContext()); } |