Skip to content
Snippets Groups Projects
Commit 444aa1dc authored by Rainer Kartmann's avatar Rainer Kartmann
Browse files

Fix data == nullptr in ice_conversions

parent cad18d9e
No related branches found
No related tags found
1 merge request!104ArMem: Minor updates
......@@ -52,14 +52,20 @@ namespace armarx
{
detail::toIceItem(ice, data);
ice.data = data.data()->getResult();
if (data.data())
{
ice.data = data.data()->getResult();
}
toIce(ice.metadata, data.metadata());
}
void armem::fromIce(const data::EntityInstance& ice, EntityInstance& data)
{
detail::fromIceItem(ice, data);
data.setData(aron::datanavigator::AronDataNavigator::FromAronData(ice.data));
if (ice.data)
{
data.setData(aron::datanavigator::AronDataNavigator::FromAronData(ice.data));
}
fromIce(ice.metadata, data.metadata());
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment