[jackrabbit-oak] branch trunk updated: OAK-10316: Importer exceptions always should mention path (#1001)

[reschke]

This is an automated email from the ASF dual-hosted git repository.

reschke pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git


The following commit(s) were added to refs/heads/trunk by this push:
     new a149bfc42f OAK-10316: Importer exceptions always should mention path 
(#1001)
a149bfc42f is described below

commit a149bfc42f5bdfd652abfdf3099a6234a0c3984e
Author: Julian Reschke <resc...@apache.org>
AuthorDate: Thu Jun 22 13:23:03 2023 +0200

    OAK-10316: Importer exceptions always should mention path (#1001)
---
 .../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();