You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by re...@apache.org on 2023/06/22 10:00:11 UTC
[jackrabbit-oak] branch OAK-10316 created (now dd4807f486)
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a change to branch OAK-10316
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
at dd4807f486 OAK-10316: Importer exception always should mention path
This branch includes the following new commits:
new dd4807f486 OAK-10316: Importer exception always should mention path
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[jackrabbit-oak] 01/01: OAK-10316: Importer exception always should mention path
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a commit to branch OAK-10316
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit dd4807f486e9d17dd281d44a0c71f02db5fb10f8
Author: Julian Reschke <ju...@gmx.de>
AuthorDate: Thu Jun 22 10:59:56 2023 +0100
OAK-10316: Importer exception always should mention path
---
.../src/main/java/org/apache/jackrabbit/oak/jcr/xml/ImporterImpl.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/ImporterImpl.java b/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/ImporterImpl.java
index 22085f01b7..82914384df 100644
--- a/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/ImporterImpl.java
+++ b/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/ImporterImpl.java
@@ -147,11 +147,11 @@ public class ImporterImpl implements Importer {
VersionManagerImpl vMgr = wsp.internalGetVersionManager();
NodeDelegate nd = new NodeDelegate(sd, importTargetTree);
if (!vMgr.isCheckedOut(nd)) {
- throw new VersionException("Target node is checked in.");
+ throw new VersionException("Target node is checked in: " + absPath);
}
boolean hasLocking = sessionContext.getRepository().getDescriptorValue(Repository.OPTION_LOCKING_SUPPORTED).getBoolean();
if (importTargetTree.getStatus() != Tree.Status.NEW && hasLocking && nd.isLocked()) {
- throw new LockException("Target node is locked.");
+ throw new LockException("Target node is locked:" + absPath);
}
effectiveNodeTypeProvider = wsp.getNodeTypeManager();
definitionProvider = wsp.getNodeTypeManager();