summaryrefslogtreecommitdiffstats
path: root/searchcore
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2021-05-12 18:17:43 +0000
committerHenning Baldersheim <balder@yahoo-inc.com>2021-05-12 18:17:43 +0000
commitfc267056dc245862adb8be3bf6464a14d47bba70 (patch)
treecea4880d18ab5a2089b4339349a78b54405cd385 /searchcore
parent59e9c48c4b5e800f9439d06541df22a62d85f2e2 (diff)
Avoid too early ack, and remove api that can be misused.
Diffstat (limited to 'searchcore')
-rw-r--r--searchcore/src/vespa/searchcore/proton/server/operationdonecontext.h4
-rw-r--r--searchcore/src/vespa/searchcore/proton/server/removedonecontext.cpp1
2 files changed, 0 insertions, 5 deletions
diff --git a/searchcore/src/vespa/searchcore/proton/server/operationdonecontext.h b/searchcore/src/vespa/searchcore/proton/server/operationdonecontext.h
index e5666daffb6..16b6a320b66 100644
--- a/searchcore/src/vespa/searchcore/proton/server/operationdonecontext.h
+++ b/searchcore/src/vespa/searchcore/proton/server/operationdonecontext.h
@@ -17,10 +17,7 @@ namespace proton {
class OperationDoneContext : public vespalib::IDestructorCallback
{
FeedToken _token;
-protected:
void ack();
- FeedToken steal() { return std::move(_token); }
-
public:
OperationDoneContext(FeedToken token);
@@ -28,5 +25,4 @@ public:
bool hasToken() const { return static_cast<bool>(_token); }
};
-
} // namespace proton
diff --git a/searchcore/src/vespa/searchcore/proton/server/removedonecontext.cpp b/searchcore/src/vespa/searchcore/proton/server/removedonecontext.cpp
index 859d8693f6d..b73b3c02120 100644
--- a/searchcore/src/vespa/searchcore/proton/server/removedonecontext.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/removedonecontext.cpp
@@ -22,7 +22,6 @@ RemoveDoneContext::RemoveDoneContext(FeedToken token, IPendingLidTracker::Token
RemoveDoneContext::~RemoveDoneContext()
{
- ack();
if (_task) {
vespalib::Executor::Task::UP res = _executor.execute(std::move(_task));
assert(!res);