From 2fe54e1fe97bf76a8a22928576676d1d0ff00c34 Mon Sep 17 00:00:00 2001
From: Fabian Peller <fabian.peller-konrad@kit.edu>
Date: Sun, 26 Nov 2023 14:53:57 +0100
Subject: [PATCH] fix double lock of mutex
---
.../server/query_proc/base/MemoryQueryProcessorBase.h | 2 +-
.../libraries/armem/server/query_proc/wm/wm.h | 11 -----------
2 files changed, 1 insertion(+), 12 deletions(-)
diff --git a/source/RobotAPI/libraries/armem/server/query_proc/base/MemoryQueryProcessorBase.h b/source/RobotAPI/libraries/armem/server/query_proc/base/MemoryQueryProcessorBase.h
index 49445070a..89a7e2231 100644
--- a/source/RobotAPI/libraries/armem/server/query_proc/base/MemoryQueryProcessorBase.h
+++ b/source/RobotAPI/libraries/armem/server/query_proc/base/MemoryQueryProcessorBase.h
@@ -113,7 +113,7 @@ namespace armarx::armem::server::query_proc::base
return true;
}
- virtual void
+ void
_processResult(ResultMemoryT& result,
const CoreSegmentT& coreSegment,
const armem::query::data::MemoryQuery& query) const
diff --git a/source/RobotAPI/libraries/armem/server/query_proc/wm/wm.h b/source/RobotAPI/libraries/armem/server/query_proc/wm/wm.h
index e5b6c3da8..4ecb033d4 100644
--- a/source/RobotAPI/libraries/armem/server/query_proc/wm/wm.h
+++ b/source/RobotAPI/libraries/armem/server/query_proc/wm/wm.h
@@ -207,17 +207,6 @@ namespace armarx::armem::server::query_proc::wm_server
MemoryQueryProcessor(armem::query::DataMode dataMode = armem::query::DataMode::WithData);
using Base::process;
-
- void
- _processResult(ResultMemoryT& result,
- const CoreSegmentT& coreSegment,
- const armem::query::data::MemoryQuery& query) const final
- {
- coreSegment.doLocked([&](){
- Base::_processResult(result, coreSegment, query);
- });
- }
-
};
}
--
GitLab