klcodanr commented on a change in pull request #513:
URL: https://github.com/apache/jackrabbit-oak/pull/513#discussion_r823815448
##########
File path:
oak-run/src/main/java/org/apache/jackrabbit/oak/index/merge/IndexDefMergerUtils.java
##########
@@ -148,6 +148,8 @@ private static String mergeProperty(String path, String
property, JsonObject anc
return cp;
} else if (Objects.equals(ap, cp)) {
return pp;
+ } else if (ap == null) {
+ return cp;
Review comment:
As per offline conversation, this _really_ shouldn't be the case and it
would be inconsistent between missing and just different properties so both
cases should be considered conflicts. Update to add tests as well.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
