From b469340ef45fc63c65069874e413c9aeeab198b3 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Sat, 26 Dec 2020 18:06:56 +0100 Subject: [PATCH] bugfix --- datapoollocal/LocalPoolVariable.tpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/datapoollocal/LocalPoolVariable.tpp b/datapoollocal/LocalPoolVariable.tpp index 48649ad5..fb129635 100644 --- a/datapoollocal/LocalPoolVariable.tpp +++ b/datapoollocal/LocalPoolVariable.tpp @@ -40,11 +40,11 @@ inline ReturnValue_t LocalPoolVariable::readWithoutLock() { PoolEntry* poolEntry = nullptr; ReturnValue_t result = hkManager->fetchPoolEntry(localPoolId, &poolEntry); - if(result != RETURN_OK and poolEntry != nullptr) { + if(result != RETURN_OK or poolEntry == nullptr) { sif::error << "PoolVector: Read of local pool variable of object " - "0x" << std::hex << std::setw(8) << std::setfill('0') << - hkManager->getOwner() << " and lp ID 0x" << localPoolId << - std::dec << " failed.\n" << std::flush; + << std::hex << std::setw(8) << std::setfill('0') + << hkManager->getOwner() << " and lp ID " << localPoolId + << std::dec << " failed." << std::setfill(' ') << std::endl; return result; } this->value = *(poolEntry->address); @@ -62,7 +62,7 @@ inline ReturnValue_t LocalPoolVariable::commit(dur_millis_t lockTimeout) { template inline ReturnValue_t LocalPoolVariable::commitWithoutLock() { if(readWriteMode == pool_rwm_t::VAR_READ) { - sif::debug << "LocalPoolVar: Invalid read write " + sif::debug << "LocalPoolVariable: Invalid read write " "mode for commit() call." << std::endl; return PoolVariableIF::INVALID_READ_WRITE_MODE; }