This is an automated email from the ASF dual-hosted git repository.
tmaret pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-journal.git
The following commit(s) were added to refs/heads/master by this push:
new af5537c SLING-11809: Set 'overwritePrimaryTypesOfFolders' to false.
(#116)
af5537c is described below
commit af5537c392c4a48dde0027fc1b0e472e95a2090d
Author: Danilo Banjac <[email protected]>
AuthorDate: Thu Mar 23 16:33:10 2023 +0100
SLING-11809: Set 'overwritePrimaryTypesOfFolders' to false. (#116)
Co-authored-by: Danilo Banjac <[email protected]>
---
.../sling/distribution/journal/bookkeeper/ContentPackageExtractor.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/src/main/java/org/apache/sling/distribution/journal/bookkeeper/ContentPackageExtractor.java
b/src/main/java/org/apache/sling/distribution/journal/bookkeeper/ContentPackageExtractor.java
index a9690b9..f020126 100644
---
a/src/main/java/org/apache/sling/distribution/journal/bookkeeper/ContentPackageExtractor.java
+++
b/src/main/java/org/apache/sling/distribution/journal/bookkeeper/ContentPackageExtractor.java
@@ -114,7 +114,7 @@ class ContentPackageExtractor {
private void installPackage(JcrPackage pack, ErrorListener listener)
throws RepositoryException, PackageException, IOException {
ImportOptions opts = new ImportOptions();
opts.setIdConflictPolicy(LEGACY);
- opts.setOverwritePrimaryTypesOfFolders(true);
+ opts.setOverwritePrimaryTypesOfFolders(false);
opts.setListener(listener);
opts.setStrict(true);
if (packageHandling == PackageHandling.Extract) {
