merged with upstream/master

This commit is contained in:
csoler 2016-12-08 09:17:56 +01:00
commit ae37787853
11 changed files with 201 additions and 83 deletions

View file

@ -90,7 +90,7 @@ bool RsGxsMessageCleanUp::clean()
RsGxsMsgMetaData* meta = *vit;
// check if expired
bool remove = (meta->mPublishTs + store_period) < now;
bool remove = store_period > 0 && (meta->mPublishTs + store_period) < now;
// check client does not want the message kept regardless of age
remove &= !(meta->mMsgStatus & GXS_SERV::GXS_MSG_STATUS_KEEP);