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
2017-08-22 07:47:43 +02:00
parent 3b52e2212c 6be124f52e
commit b15efba1db
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/ebus/data.cpp
+1 -1
View File
@@ -1211,7 +1211,7 @@ result_t DataFieldTemplates::getFieldMap(const string& preferLanguage, vector<st
}
} else {
map<string, size_t>::iterator previous = seen.find(lowerName);
if (seen.find(lowerName) != seen.end()) {
if (previous != seen.end()) {
if (inDataFields) {
*errorDescription = "duplicate field " + name;
} else {
src/lib/ebus/message.cpp
+1 -1
View File
@@ -1861,7 +1861,7 @@ result_t MessageMap::getFieldMap(const string& preferLanguage, vector<string>* r
}
} else {
map<string, size_t>::iterator previous = seen.find(lowerName);
if (seen.find(lowerName) != seen.end()) {
if (previous != seen.end()) {
if (inDataFields) {
*errorDescription = "duplicate field " + name;
} else {