This is an automated email from the ASF dual-hosted git repository.
simonetripodi pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-cpconverter.git
The following commit(s) were added to refs/heads/master by this push:
new a33fbba SLING-8578 - Nodes which contain : are not correctly processed
new ef716c5 Merge pull request #11 from andreituicu/issue/SLING-8578-2
a33fbba is described below
commit a33fbbaf215a729d22c9b9b0d4d12da1ad68691c
Author: Andrei Tuicu <[email protected]>
AuthorDate: Mon Jul 15 09:51:36 2019 +0300
SLING-8578 - Nodes which contain : are not correctly processed
---
.../org/apache/sling/feature/cpconverter/acl/DefaultAclManager.java | 4 ++++
1 file changed, 4 insertions(+)
diff --git
a/src/main/java/org/apache/sling/feature/cpconverter/acl/DefaultAclManager.java
b/src/main/java/org/apache/sling/feature/cpconverter/acl/DefaultAclManager.java
index 2c0fb84..f91f054 100644
---
a/src/main/java/org/apache/sling/feature/cpconverter/acl/DefaultAclManager.java
+++
b/src/main/java/org/apache/sling/feature/cpconverter/acl/DefaultAclManager.java
@@ -19,6 +19,7 @@ package org.apache.sling.feature.cpconverter.acl;
import java.io.File;
import java.io.FileInputStream;
import java.nio.file.Path;
+import java.nio.file.Paths;
import java.util.Formatter;
import java.util.HashMap;
import java.util.HashSet;
@@ -32,6 +33,7 @@ import java.util.Set;
import java.util.TreeSet;
import java.util.stream.Collectors;
+import org.apache.jackrabbit.vault.util.PlatformNameFormat;
import org.apache.sling.feature.Extension;
import org.apache.sling.feature.ExtensionType;
import org.apache.sling.feature.Feature;
@@ -215,6 +217,8 @@ public final class DefaultAclManager implements AclManager {
}
private static String computePathType(Path path,
List<VaultPackageAssembler> packageAssemblers) {
+ path = Paths.get(PlatformNameFormat.getPlatformPath(path.toString()));
+
for (VaultPackageAssembler packageAssembler: packageAssemblers) {
File currentDir = packageAssembler.getEntry(path.toString());