From 8fb815b100baa2ecb4a11321771bc2277d033697 Mon Sep 17 00:00:00 2001
From: Rainer Kartmann <rainer.kartmann@kit.edu>
Date: Mon, 10 May 2021 18:49:25 +0200
Subject: [PATCH] change default behaviour to add missing provider segments on
commit
---
.../armem/core/base/CoreSegmentBase.h | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/source/RobotAPI/libraries/armem/core/base/CoreSegmentBase.h b/source/RobotAPI/libraries/armem/core/base/CoreSegmentBase.h
index 6ea66c74b..ead811e5a 100644
--- a/source/RobotAPI/libraries/armem/core/base/CoreSegmentBase.h
+++ b/source/RobotAPI/libraries/armem/core/base/CoreSegmentBase.h
@@ -140,7 +140,16 @@ namespace armarx::armem::base
}
else
{
- throw armem::error::MissingEntry("provider segment", update.entityID.providerSegmentName, getLevelName(), this->getKeyString());
+ if (_addMissingProviderSegmentDuringUpdate)
+ {
+ // Add the missing provider segment (with this core segment's type).
+ ProviderSegmentT& provSeg = addProviderSegment(update.entityID.providerSegmentName);
+ return provSeg.update(update);
+ }
+ else
+ {
+ throw armem::error::MissingEntry("provider segment", update.entityID.providerSegmentName, getLevelName(), this->getKeyString());
+ }
}
}
@@ -230,13 +239,20 @@ namespace armarx::armem::base
{
Base::_copySelf(other);
other.aronType() = _aronType;
+ other._addMissingProviderSegmentDuringUpdate = _addMissingProviderSegmentDuringUpdate;
}
virtual void _copySelfEmpty(DerivedT& other) const override
{
Base::_copySelfEmpty(other);
other.aronType() = _aronType;
+ other._addMissingProviderSegmentDuringUpdate = _addMissingProviderSegmentDuringUpdate;
}
+
+ private:
+
+ bool _addMissingProviderSegmentDuringUpdate = true;
+
};
}
--
GitLab