You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@jackrabbit.apache.org by "reschke (via GitHub)" <gi...@apache.org> on 2025/11/24 19:27:40 UTC
[PR] JCRVLT-828: Fix handling of target node UUID for IdConflictPolicy.LEGACY [jackrabbit-filevault]
reschke opened a new pull request, #398:
URL: https://github.com/apache/jackrabbit-filevault/pull/398
(no comment)
--
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: dev-unsubscribe@jackrabbit.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] JCRVLT-828: Fix handling of target node UUID for IdConflictPolicy.LEGACY [jackrabbit-filevault]
Posted by "reschke (via GitHub)" <gi...@apache.org>.
reschke merged PR #398:
URL: https://github.com/apache/jackrabbit-filevault/pull/398
--
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: dev-unsubscribe@jackrabbit.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] JCRVLT-828: Fix handling of target node UUID for IdConflictPolicy.LEGACY [jackrabbit-filevault]
Posted by "kwin (via GitHub)" <gi...@apache.org>.
kwin commented on code in PR #398:
URL: https://github.com/apache/jackrabbit-filevault/pull/398#discussion_r2557521701
##########
vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/io/DocViewImporter.java:
##########
@@ -906,16 +906,20 @@ private StackElement addNode(DocViewNode2 docViewNode) throws RepositoryExceptio
} else {
log.warn("To-be imported node and existing conflicting node have different parents. Will create new identifier for the former. ({})",
newNodePath);
- preprocessedProperties.removeIf(p -> p.getName().equals(NameConstants.JCR_UUID)
- || p.getName().equals(NameConstants.JCR_BASEVERSION)
+ preprocessedProperties.removeIf(p -> p.getName().equals(NameConstants.JCR_UUID)
+ || p.getName().equals(NameConstants.JCR_BASEVERSION)
|| p.getName().equals(NameConstants.JCR_PREDECESSORS)
|| p.getName().equals(NameConstants.JCR_SUCCESSORS)
|| p.getName().equals(NameConstants.JCR_VERSIONHISTORY));
}
}
}
} catch (ItemNotFoundException e) {
- // ignore
+ // no node with same ID present, but target node exists
+ if (existingNode != null && idConflictPolicy == IdConflictPolicy.LEGACY && existingNode.isNodeType(JcrConstants.MIX_REFERENCEABLE)) {
+ log.debug("IdConflictPolicy.LEGACY - removing Identifier " + identifier.get() + " from imported package at: " + docViewNode.getName());
Review Comment:
I find this a bit confusing, what about
```suggestion
log.debug("IdConflictPolicy.LEGACY - ignoring Identifier " + identifier.get() + " from imported package at " + docViewNode.getName() + " but keep existing identifier " + existingNode.getIdentifier() );
```
--
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: dev-unsubscribe@jackrabbit.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] JCRVLT-828: Fix handling of target node UUID for IdConflictPolicy.LEGACY [jackrabbit-filevault]
Posted by "reschke (via GitHub)" <gi...@apache.org>.
reschke commented on PR #398:
URL: https://github.com/apache/jackrabbit-filevault/pull/398#issuecomment-3574684951
cleaned up
--
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: dev-unsubscribe@jackrabbit.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org