|| (propertyValue != null && !entry.getValue().equals(propertyValue)) && !baseName.isPropertyValuePattern(entry.getKey())) { matches = false; break;
if (propertyValue == null || (!entry.getValue().equals(propertyValue)) && !baseName.isPropertyValuePattern(entry.getKey())) { matches = false; break;