Skip to content
Snippets Groups Projects
Commit 41109c6c authored by Fabian Tërnava's avatar Fabian Tërnava
Browse files

add new public commitLocking methods (similar to commit) to iceAdapter

parent 65027c47
No related branches found
No related tags found
No related merge requests found
......@@ -157,6 +157,50 @@ namespace armarx::armem::server
return this->_commit(commit, false);
}
data::CommitResult
MemoryToIceAdapter::commitLocking(const data::Commit& commitIce, Time timeArrived)
{
ARMARX_TRACE;
ARMARX_CHECK_NOT_NULL(workingMemory);
auto handleException = [](const std::string& what)
{
data::CommitResult result;
data::EntityUpdateResult& r = result.results.emplace_back();
r.success = false;
r.errorMessage = what;
return result;
};
armem::Commit commit;
try
{
::armarx::armem::fromIce(commitIce, commit, timeArrived);
}
catch (const aron::error::AronNotValidException& e)
{
throw;
return handleException(e.what());
}
catch (const Ice::Exception& e)
{
throw;
return handleException(e.what());
}
armem::CommitResult result = this->commitLocking(commit);
data::CommitResult resultIce;
toIce(resultIce, result);
return resultIce;
}
data::CommitResult
MemoryToIceAdapter::commitLocking(const data::Commit& commitIce)
{
ARMARX_TRACE;
return commitLocking(commitIce, armem::Time::Now());
}
armem::CommitResult
MemoryToIceAdapter::commitLocking(const armem::Commit& commit)
{
......
......@@ -37,6 +37,8 @@ namespace armarx::armem::server
data::CommitResult commit(const data::Commit& commitIce, Time timeArrived);
data::CommitResult commit(const data::Commit& commitIce);
armem::CommitResult commit(const armem::Commit& commit);
data::CommitResult commitLocking(const data::Commit& commitIce, Time timeArrived);
data::CommitResult commitLocking(const data::Commit& commitIce);
armem::CommitResult commitLocking(const armem::Commit& commit);
......
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