You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by kw...@apache.org on 2022/01/19 16:45:44 UTC
[jackrabbit-filevault] branch feature/JCRVLT-596-keep-nonnull-return-value created (now 3d6a497)
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a change to branch feature/JCRVLT-596-keep-nonnull-return-value
in repository https://gitbox.apache.org/repos/asf/jackrabbit-filevault.git.
at 3d6a497 never persist default conflict policy
This branch includes the following new commits:
new 3d6a497 never persist default conflict policy
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-filevault] 01/01: never persist default conflict policy
Posted by kw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch feature/JCRVLT-596-keep-nonnull-return-value
in repository https://gitbox.apache.org/repos/asf/jackrabbit-filevault.git
commit 3d6a497e242b7fbbe4ed9c34b0ad337105de9594
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Wed Jan 19 17:45:32 2022 +0100
never persist default conflict policy
---
.../vault/packaging/registry/impl/PackageTaskOptionsSerializer.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/PackageTaskOptionsSerializer.java b/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/PackageTaskOptionsSerializer.java
index 7e3429b..57f3722 100644
--- a/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/PackageTaskOptionsSerializer.java
+++ b/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/PackageTaskOptionsSerializer.java
@@ -100,7 +100,10 @@ public class PackageTaskOptionsSerializer {
writeOption(writer, TAG_DRY_RUN, Boolean.class, importOptions.isDryRun());
writeOption(writer, TAG_IMPORT_MODE, ImportMode.class, importOptions.getImportMode());
writeOption(writer, TAG_OVERWRITE_PRIMARY_TYPES_OF_FOLDERS, Boolean.class, importOptions.overwritePrimaryTypesOfFolders());
- writeOption(writer, TAG_ID_CONFLICT_POLICY, IdConflictPolicy.class, importOptions.getIdConflictPolicy());
+ // don't persist default conflict policy
+ if (importOptions.hasIdConflictPolicyBeenSet()) {
+ writeOption(writer, TAG_ID_CONFLICT_POLICY, IdConflictPolicy.class, importOptions.getIdConflictPolicy());
+ }
}
public ImportOptionsPackageTaskOption loadImportOptions(Element element) {