Skip to content
Snippets Groups Projects
Commit 9a2945de authored by Martin Christoph Hierholzer's avatar Martin Christoph Hierholzer
Browse files

(maybe temporary) fix for version numbers going backwards (see ChimeraTK/DeviceAccess#178)

parent 959c3b0c
No related branches found
No related tags found
No related merge requests found
...@@ -145,11 +145,21 @@ namespace ChimeraTK { ...@@ -145,11 +145,21 @@ namespace ChimeraTK {
if(_hasReportedException || _hasThrownToInhibitTransfer) { if(_hasReportedException || _hasThrownToInhibitTransfer) {
_dataValidity = DataValidity::faulty; _dataValidity = DataValidity::faulty;
_versionNumber = _deviceModule->getExceptionVersionNumber(); // Note: This assertion does not hold
// See discussion in https://github.com/ChimeraTK/DeviceAccess/pull/178
// assert(_deviceModule->getExceptionVersionNumber() > _versionNumber);
if(_deviceModule->getExceptionVersionNumber() > _versionNumber) {
_versionNumber = _deviceModule->getExceptionVersionNumber();
}
} }
else { else {
_dataValidity = _target->dataValidity(); _dataValidity = _target->dataValidity();
_versionNumber = _target->getVersionNumber(); // Note: This assertion does not hold
// See discussion in https://github.com/ChimeraTK/DeviceAccess/pull/178
//assert(_target->getVersionNumber() >= _versionNumber);
if(_target->getVersionNumber() > _versionNumber) {
_versionNumber = _target->getVersionNumber();
}
} }
// only replace the user buffer if there really is new data // only replace the user buffer if there really is new data
......
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