summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fnet/src/vespa/fnet/connection.cpp2
-rw-r--r--vespalib/src/vespa/vespalib/net/crypto_engine.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/fnet/src/vespa/fnet/connection.cpp b/fnet/src/vespa/fnet/connection.cpp
index a5f0b427a23..11856759165 100644
--- a/fnet/src/vespa/fnet/connection.cpp
+++ b/fnet/src/vespa/fnet/connection.cpp
@@ -390,7 +390,7 @@ FNET_Connection::Write(bool direct)
++my_write_work;
}
- if ((res >= 0) && !broken) { // flush output pipeline
+ if (res >= 0) { // flush output pipeline
res = _socket->flush();
while (res > 0) {
res = _socket->flush();
diff --git a/vespalib/src/vespa/vespalib/net/crypto_engine.cpp b/vespalib/src/vespa/vespalib/net/crypto_engine.cpp
index ec436a414cc..8832b4b1cfe 100644
--- a/vespalib/src/vespa/vespalib/net/crypto_engine.cpp
+++ b/vespalib/src/vespa/vespalib/net/crypto_engine.cpp
@@ -171,7 +171,7 @@ CryptoEngine::~CryptoEngine() = default;
CryptoEngine::SP
CryptoEngine::get_default()
{
- std::lock_guard<std::mutex> guard(_shared_lock);
+ std::lock_guard guard(_shared_lock);
if (!_shared_default) {
_shared_default = create_default_crypto_engine();
}