You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by re...@apache.org on 2024/08/13 09:40:13 UTC
(jackrabbit-filevault) branch master updated: JCRVLT-768: vlt: when DEGUG logging stashing ops, add the IdConflictPolicy as well (#347)
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jackrabbit-filevault.git
The following commit(s) were added to refs/heads/master by this push:
new 30dc3481 JCRVLT-768: vlt: when DEGUG logging stashing ops, add the IdConflictPolicy as well (#347)
30dc3481 is described below
commit 30dc3481d060b683c195076465addd72235ce281
Author: Julian Reschke <ju...@gmx.de>
AuthorDate: Tue Aug 13 11:40:08 2024 +0200
JCRVLT-768: vlt: when DEGUG logging stashing ops, add the IdConflictPolicy as well (#347)
* Documentation: Fix typo
* JCRVLT-768: vlt: when DEGUG logging stashing ops, add the IdConflictPolicy as well
---------
Co-authored-by: Konrad Windszus <kw...@apache.org>
---
src/site/markdown/packagetypes.md | 2 +-
.../apache/jackrabbit/vault/fs/impl/io/DocViewImporter.java | 10 ++++++----
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/site/markdown/packagetypes.md b/src/site/markdown/packagetypes.md
index d11577d6..19a50364 100644
--- a/src/site/markdown/packagetypes.md
+++ b/src/site/markdown/packagetypes.md
@@ -54,7 +54,7 @@ Container Package
Container packages act as deployment vehicle and don't contain regular nodes. Only OSGi bundles, configuration and sub packages (for use with the [OSGi Installer](https://sling.apache.org/documentation/bundles/jcr-installer-provider.html)) are allowed. In addition also sub packages below `/etc/packages/...` are supported.
-Containers may be nested which means they may contain itself packages of type `container`.
+Containers may be nested which means they may contain themselves packages of type `container`.
Mixed Package
diff --git a/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/io/DocViewImporter.java b/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/io/DocViewImporter.java
index 3572276b..b341d05c 100644
--- a/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/io/DocViewImporter.java
+++ b/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/io/DocViewImporter.java
@@ -993,8 +993,9 @@ public class DocViewImporter implements DocViewParserHandler {
if (identifier.isPresent() && !node.getIdentifier().equals(identifier.get()) && !"rep:root".equals(ni.getPrimaryType().orElse(""))) {
long startTime = System.currentTimeMillis();
String previousIdentifier = node.getIdentifier();
- log.debug("Node stashing for {} starting, existing identifier: {}, new identifier: {}, import mode: {}",
- node.getPath(), previousIdentifier, identifier.get(), importMode);
+ log.debug(
+ "Node stashing for {} starting, existing identifier: {}, new identifier: {}, ImportMode: {}, IdConflictPoliy: {}",
+ node.getPath(), previousIdentifier, identifier.get(), importMode, idConflictPolicy);
NodeStash stash = new NodeStash(session, node.getPath());
stash.stash(importInfo);
Node parent = node.getParent();
@@ -1002,9 +1003,10 @@ public class DocViewImporter implements DocViewParserHandler {
node.remove();
updatedNode = createNewNode(parent, ni);
stash.recover(importMode, importInfo);
- log.debug("Node stashing for {} finished, previous identifier: {}, new identifier: {}, elapsed: {}, import mode: {}",
+ log.debug(
+ "Node stashing for {} finished, previous identifier: {}, new identifier: {}, elapsed: {}, ImportMode: {}, IdConflictPoliy: {}",
updatedNode.getPath(), previousIdentifier, updatedNode.getIdentifier(),
- Duration.ofMillis(System.currentTimeMillis() - startTime), importMode);
+ Duration.ofMillis(System.currentTimeMillis() - startTime), importMode, idConflictPolicy);
} else {
// TODO: is this faster than using sysview import?
// set new primary type (but never set rep:root)