diff --git a/datapool/PoolReadHelper.h b/datapool/PoolReadGuard.h similarity index 94% rename from datapool/PoolReadHelper.h rename to datapool/PoolReadGuard.h index 9825e83c1..eb014f1e7 100644 --- a/datapool/PoolReadHelper.h +++ b/datapool/PoolReadGuard.h @@ -8,9 +8,9 @@ /** * @brief Helper class to read data sets or pool variables */ -class PoolReadHelper { +class PoolReadGuard { public: - PoolReadHelper(ReadCommitIF* readObject, + PoolReadGuard(ReadCommitIF* readObject, MutexIF::TimeoutType timeoutType = MutexIF::TimeoutType::WAITING, uint32_t mutexTimeout = 20): readObject(readObject), mutexTimeout(mutexTimeout) { @@ -42,7 +42,7 @@ public: /** * @brief Default destructor which will take care of commiting changed values. */ - ~PoolReadHelper() { + ~PoolReadGuard() { if(readObject != nullptr and not noCommit) { readObject->commit(timeoutType, mutexTimeout); } diff --git a/unittest/tests/datapoollocal/LocalPoolOwnerBase.h b/unittest/tests/datapoollocal/LocalPoolOwnerBase.h index bb090e3b3..5c277850f 100644 --- a/unittest/tests/datapoollocal/LocalPoolOwnerBase.h +++ b/unittest/tests/datapoollocal/LocalPoolOwnerBase.h @@ -192,7 +192,7 @@ public: resetSubscriptionList(); ReturnValue_t status = HasReturnvaluesIF::RETURN_OK; { - PoolReadHelper readHelper(&dataset); + PoolReadGuard readHelper(&dataset); if(readHelper.getReadResult() != HasReturnvaluesIF::RETURN_OK) { status = readHelper.getReadResult(); } @@ -205,7 +205,7 @@ public: } { - PoolReadHelper readHelper(&testUint32); + PoolReadGuard readHelper(&testUint32); if(readHelper.getReadResult() != HasReturnvaluesIF::RETURN_OK) { status = readHelper.getReadResult(); } @@ -214,7 +214,7 @@ public: } { - PoolReadHelper readHelper(&testInt64Vec); + PoolReadGuard readHelper(&testInt64Vec); if(readHelper.getReadResult() != HasReturnvaluesIF::RETURN_OK) { status = readHelper.getReadResult(); }