Merge pull request izpack#655 from mezmerize/IZPACK-1583

IZPACK-1583
mitkola · Mar 27, 2018 · f99d232 · f99d232
2 parents 9b9d390 + b83d80f
commit f99d232
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/...util/src/main/java/com/izforge/izpack/util/xmlmerge/matcher/AbstractAttributeMatcher.java b/...util/src/main/java/com/izforge/izpack/util/xmlmerge/matcher/AbstractAttributeMatcher.java
@@ -67,19 +67,24 @@ public boolean matches(Element originalElement, Element patchElement)
                         {
                             if (origAttribute.getQualifiedName().equalsIgnoreCase(patchAttribute.getQualifiedName()))
                             {
-                                return equalsString(origAttribute.getValue(), patchAttribute.getValue(), ignoreCaseAttributeValue());
+                                if (!equalsString(origAttribute.getValue(), patchAttribute.getValue(), ignoreCaseAttributeValue())) {
+                                    return false;
+                                }
                             }
                         }
                         else
                         {
                             if (origAttribute.getQualifiedName().equals(patchAttribute.getQualifiedName()))
                             {
-                                return equalsString(origAttribute.getValue(), patchAttribute.getValue(), ignoreCaseAttributeValue());
+                                if (!equalsString(origAttribute.getValue(), patchAttribute.getValue(), ignoreCaseAttributeValue())) {
+                                    return false;
+                                }
                             }
                         }
                     }
                 }
             }
+            return true;
         }
         return false;
     }