You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by pa...@apache.org on 2021/05/19 12:24:54 UTC
[sling-org-apache-sling-feature-cpconverter] 01/01: SLING-10395:
ignore empty mappings
This is an automated email from the ASF dual-hosted git repository.
pauls pushed a commit to branch issues/SLING-10395
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-cpconverter.git
commit e592736f725ecc3434340169cd11838063d389f0
Author: Karl Pauls <ka...@gmail.com>
AuthorDate: Wed May 19 14:24:41 2021 +0200
SLING-10395: ignore empty mappings
---
.../sling/feature/cpconverter/features/DefaultFeaturesManager.java | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/main/java/org/apache/sling/feature/cpconverter/features/DefaultFeaturesManager.java b/src/main/java/org/apache/sling/feature/cpconverter/features/DefaultFeaturesManager.java
index c75c7f8..f84b9e4 100644
--- a/src/main/java/org/apache/sling/feature/cpconverter/features/DefaultFeaturesManager.java
+++ b/src/main/java/org/apache/sling/feature/cpconverter/features/DefaultFeaturesManager.java
@@ -325,6 +325,10 @@ public class DefaultFeaturesManager implements FeaturesManager, PackagesEventsEm
if (mappings != null) {
List<String> newMappings = new ArrayList<>();
for (String usermapping : mappings) {
+ if (usermapping == null || usermapping.trim().isEmpty()) {
+ // invalid empty mapping => ignore
+ continue;
+ }
Mapping mapping = new Mapping(usermapping, enforceServiceMappingByPrincipal);
getAclManager().addMapping(mapping);
newMappings.add(mapping.asString());