nils/ebusd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:john30/ebusd

Browse Source
This commit is contained in:
john30
2016-01-30 17:00:32 +01:00
parent 153702882b f60b29fe16
commit a0fdf2d5be
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/ebus/message.cpp
+7 -5
View File
@@ -1178,11 +1178,13 @@ result_t MessageMap::add(Message* message, bool storeByName)
if (!m_addAll) {
map<unsigned long long, vector<Message*> >::iterator keyIt = m_messagesByKey.find(key);
if (keyIt != m_messagesByKey.end()) {
if (!conditional)
return RESULT_ERR_DUPLICATE; // duplicate key
vector<Message*>* messages = &keyIt->second;
if (!messages->front()->isConditional())
return RESULT_ERR_DUPLICATE; // duplicate key
Message* other = getFirstAvailable(keyIt->second, *message);
if (other != NULL) {
if (!conditional)
return RESULT_ERR_DUPLICATE; // duplicate key
if (!other->isConditional())
return RESULT_ERR_DUPLICATE; // duplicate key
}
}
}
bool isPassive = message->isPassive();