[MNG-7709] Regression in configuration merge (#1023)

This commit is contained in:
Guillaume Nodet 2023-03-09 21:15:24 +01:00 committed by GitHub
parent dc8ec4c973
commit 116ca6a3ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions

View File

@ -230,7 +230,7 @@ public class XmlNodeImpl implements Serializable, XmlNode {
for (Map.Entry<String, String> attr : recessive.getAttributes().entrySet()) {
String key = attr.getKey();
if (isEmpty(dominant.getAttribute(key)) && !SELF_COMBINATION_MODE_ATTRIBUTE.equals(key)) {
if (isEmpty(dominant.getAttribute(key))) {
if (attrs == null) {
attrs = new HashMap<>();
}