From f23d6473205aa304678afb36502526cdab368ecb Mon Sep 17 00:00:00 2001
From: Rainer Kartmann <rainer.kartmann@kit.edu>
Date: Fri, 16 Jul 2021 09:09:28 +0200
Subject: [PATCH] Lock core segment in addSegment()
---
source/RobotAPI/libraries/armem/server/MemoryToIceAdapter.cpp | 2 ++
1 file changed, 2 insertions(+)
diff --git a/source/RobotAPI/libraries/armem/server/MemoryToIceAdapter.cpp b/source/RobotAPI/libraries/armem/server/MemoryToIceAdapter.cpp
index a846cffac..35165fb63 100644
--- a/source/RobotAPI/libraries/armem/server/MemoryToIceAdapter.cpp
+++ b/source/RobotAPI/libraries/armem/server/MemoryToIceAdapter.cpp
@@ -55,6 +55,7 @@ namespace armarx::armem::server
if (input.providerSegmentName.size() > 0)
{
+ std::scoped_lock lock(coreSegment->mutex());
try
{
coreSegment->addProviderSegment(input.providerSegmentName);
@@ -94,6 +95,7 @@ namespace armarx::armem::server
return output;
}
+
data::CommitResult
MemoryToIceAdapter::commit(const data::Commit& commitIce, Time timeArrived)
{
--
GitLab