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/08/30 08:07:00 UTC
[jackrabbit-oak] branch 1.22 updated (99d9de5ab5 -> 7dacd9408a)
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a change to branch 1.22
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
from 99d9de5ab5 OAK-9970 : Internal code calls LockManager.isLocked(String) (#735)
new aa08f62d6b OAK-10316: Importer exceptions always should mention path (#1001)
new 7dacd9408a OAK-10316: Importer exceptions always should mention path - add missing SP character
The 2 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.
Summary of changes:
.../src/main/java/org/apache/jackrabbit/oak/jcr/xml/ImporterImpl.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
[jackrabbit-oak] 01/02: OAK-10316: Importer exceptions always should mention path (#1001)
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a commit to branch 1.22
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit aa08f62d6b162edd050797cef889639a079079e8
Author: Julian Reschke <re...@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 6f64294495..5c692bcc3c 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();
[jackrabbit-oak] 02/02: OAK-10316: Importer exceptions always should mention path - add missing SP character
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a commit to branch 1.22
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit 7dacd9408aaa2c3d4d7fd958e2c8d8ecfac1d92b
Author: Julian Reschke <ju...@gmx.de>
AuthorDate: Wed Aug 2 15:50:52 2023 +0100
OAK-10316: Importer exceptions always should mention path - add missing SP character
---
.../src/main/java/org/apache/jackrabbit/oak/jcr/xml/ImporterImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 5c692bcc3c..882bd89eb5 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
@@ -151,7 +151,7 @@ public class ImporterImpl implements Importer {
}
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:" + absPath);
+ throw new LockException("Target node is locked: " + absPath);
}
effectiveNodeTypeProvider = wsp.getNodeTypeManager();
definitionProvider = wsp.getNodeTypeManager();