SLING-6555 : Migrate to R6 annotations, clean up dependencies
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1784118 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/sling/serviceusermapping/impl/MappingConfigAmendment.java b/src/main/java/org/apache/sling/serviceusermapping/impl/MappingConfigAmendment.java
index 1d10c38..ff631cf 100644
--- a/src/main/java/org/apache/sling/serviceusermapping/impl/MappingConfigAmendment.java
+++ b/src/main/java/org/apache/sling/serviceusermapping/impl/MappingConfigAmendment.java
@@ -68,19 +68,23 @@
void configure(final Config config) {
final String[] props = config.user_mapping();
- final ArrayList<Mapping> mappings = new ArrayList<Mapping>(props.length);
- for (final String prop : props) {
- if (prop != null && prop.trim().length() > 0 ) {
- try {
- final Mapping mapping = new Mapping(prop.trim());
- mappings.add(mapping);
- } catch (final IllegalArgumentException iae) {
- logger.info("configure: Ignoring '{}': {}", prop, iae.getMessage());
+ if ( props != null ) {
+ final ArrayList<Mapping> mappings = new ArrayList<Mapping>(props.length);
+ for (final String prop : props) {
+ if (prop != null && prop.trim().length() > 0 ) {
+ try {
+ final Mapping mapping = new Mapping(prop.trim());
+ mappings.add(mapping);
+ } catch (final IllegalArgumentException iae) {
+ logger.info("configure: Ignoring '{}': {}", prop, iae.getMessage());
+ }
}
}
- }
- this.serviceUserMappings = mappings.toArray(new Mapping[mappings.size()]);
+ this.serviceUserMappings = mappings.toArray(new Mapping[mappings.size()]);
+ } else {
+ this.serviceUserMappings = new Mapping[0];
+ }
this.serviceRanking = config.service_ranking();
}
diff --git a/src/main/java/org/apache/sling/serviceusermapping/impl/ServiceUserMapperImpl.java b/src/main/java/org/apache/sling/serviceusermapping/impl/ServiceUserMapperImpl.java
index 314046b..75c8599 100644
--- a/src/main/java/org/apache/sling/serviceusermapping/impl/ServiceUserMapperImpl.java
+++ b/src/main/java/org/apache/sling/serviceusermapping/impl/ServiceUserMapperImpl.java
@@ -106,19 +106,23 @@
final String[] props = config.user_mapping();
- final ArrayList<Mapping> mappings = new ArrayList<Mapping>(props.length);
- for (final String prop : props) {
- if (prop != null && prop.trim().length() > 0 ) {
- try {
- final Mapping mapping = new Mapping(prop.trim());
- mappings.add(mapping);
- } catch (final IllegalArgumentException iae) {
- log.error("configure: Ignoring '{}': {}", prop, iae.getMessage());
+ if ( props != null ) {
+ final ArrayList<Mapping> mappings = new ArrayList<Mapping>(props.length);
+ for (final String prop : props) {
+ if (prop != null && prop.trim().length() > 0 ) {
+ try {
+ final Mapping mapping = new Mapping(prop.trim());
+ mappings.add(mapping);
+ } catch (final IllegalArgumentException iae) {
+ log.error("configure: Ignoring '{}': {}", prop, iae.getMessage());
+ }
}
}
- }
- this.globalServiceUserMappings = mappings.toArray(new Mapping[mappings.size()]);
+ this.globalServiceUserMappings = mappings.toArray(new Mapping[mappings.size()]);
+ } else {
+ this.globalServiceUserMappings = new Mapping[0];
+ }
this.defaultUser = config.user_default();
RegistrationSet registrationSet = null;
