From 46fe44d442b684c3487ae6b2e790b8f79af905a1 Mon Sep 17 00:00:00 2001
From: alissa <alissamueller@outlook.de>
Date: Thu, 3 Feb 2022 14:39:51 +0100
Subject: [PATCH] Turned entity update into commit for attachment changes
(Subscription trigger)
---
.../armem_objects/server/instance/Segment.cpp | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/source/RobotAPI/libraries/armem_objects/server/instance/Segment.cpp b/source/RobotAPI/libraries/armem_objects/server/instance/Segment.cpp
index 7129c5d5e..c86bc7e6f 100644
--- a/source/RobotAPI/libraries/armem_objects/server/instance/Segment.cpp
+++ b/source/RobotAPI/libraries/armem_objects/server/instance/Segment.cpp
@@ -630,7 +630,8 @@ namespace armarx::armem::server::obj::instance
// Store attachment in new entity snapshot.
{
- armem::EntityUpdate update;
+ armem::Commit commit;
+ armem::EntityUpdate & update = commit.add();
update.entityID = objectEntity->id();
update.timeCreated = now;
{
@@ -639,7 +640,7 @@ namespace armarx::armem::server::obj::instance
updated.pose.attachmentValid = true;
update.instancesData = { updated.toAron() };
}
- objectEntity->update(update);
+ iceMemory.commit(commit);
}
ARMARX_INFO << "Attached object " << objectID << " by provider '" << data.pose.providerName << "' "
@@ -737,7 +738,8 @@ namespace armarx::armem::server::obj::instance
Time now,
bool commitAttachedPose)
{
- armem::EntityUpdate update;
+ armem::Commit commit;
+ armem::EntityUpdate & update = commit.add();
update.entityID = entity.id();
update.timeCreated = now;
{
@@ -762,7 +764,7 @@ namespace armarx::armem::server::obj::instance
update.instancesData = { updated.toAron() };
}
- entity.update(update);
+ iceMemory.commit(commit);
}
--
GitLab