summaryrefslogtreecommitdiffstats
path: root/searchcore/src/tests/proton/documentdb/maintenancecontroller
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2019-11-26 11:35:57 +0000
committerHenning Baldersheim <balder@yahoo-inc.com>2019-12-03 10:04:27 +0000
commit402ca2699bb8e5fea3c4ceb39e404b21db6353b3 (patch)
tree23bc3033ae37f6d6296ee1cbb838e5c265543c15 /searchcore/src/tests/proton/documentdb/maintenancecontroller
parent42cc516b2ef408ee52c9e8b552ce4fac10041f1a (diff)
Wrap soft and hard doom in an CombinedDoom.
If softdoom factor has been overridden, we shall not adjust the automatic one.
Diffstat (limited to 'searchcore/src/tests/proton/documentdb/maintenancecontroller')
-rw-r--r--searchcore/src/tests/proton/documentdb/maintenancecontroller/maintenancecontroller_test.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/searchcore/src/tests/proton/documentdb/maintenancecontroller/maintenancecontroller_test.cpp b/searchcore/src/tests/proton/documentdb/maintenancecontroller/maintenancecontroller_test.cpp
index c732da58dd7..fdd53d629ad 100644
--- a/searchcore/src/tests/proton/documentdb/maintenancecontroller/maintenancecontroller_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/maintenancecontroller/maintenancecontroller_test.cpp
@@ -34,6 +34,7 @@
#include <vespa/vespalib/util/closuretask.h>
#include <vespa/vespalib/util/gate.h>
#include <vespa/vespalib/util/threadstackexecutor.h>
+#include <vespa/fastos/thread.h>
#include <unistd.h>
#include <vespa/log/log.h>
@@ -785,9 +786,7 @@ MyExecutor::MyExecutor()
}
-MyExecutor::~MyExecutor()
-{
-}
+MyExecutor::~MyExecutor() = default;
bool