Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 79266200C24 for ; Thu, 23 Feb 2017 13:40:35 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 77AD7160B62; Thu, 23 Feb 2017 12:40:35 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 58632160B50 for ; Thu, 23 Feb 2017 13:40:34 +0100 (CET) Received: (qmail 22093 invoked by uid 500); 23 Feb 2017 12:40:33 -0000 Mailing-List: contact commits-help@sling.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@sling.apache.org Delivered-To: mailing list commits@sling.apache.org Received: (qmail 22084 invoked by uid 99); 23 Feb 2017 12:40:33 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 23 Feb 2017 12:40:33 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id C78783A0016 for ; Thu, 23 Feb 2017 12:40:32 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1784118 - in /sling/trunk/bundles/extensions/serviceusermapper/src/main/java/org/apache/sling/serviceusermapping/impl: MappingConfigAmendment.java ServiceUserMapperImpl.java Date: Thu, 23 Feb 2017 12:40:32 -0000 To: commits@sling.apache.org From: cziegeler@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20170223124032.C78783A0016@svn01-us-west.apache.org> archived-at: Thu, 23 Feb 2017 12:40:35 -0000 Author: cziegeler Date: Thu Feb 23 12:40:32 2017 New Revision: 1784118 URL: http://svn.apache.org/viewvc?rev=1784118&view=rev Log: SLING-6555 : Migrate to R6 annotations, clean up dependencies Modified: sling/trunk/bundles/extensions/serviceusermapper/src/main/java/org/apache/sling/serviceusermapping/impl/MappingConfigAmendment.java sling/trunk/bundles/extensions/serviceusermapper/src/main/java/org/apache/sling/serviceusermapping/impl/ServiceUserMapperImpl.java Modified: sling/trunk/bundles/extensions/serviceusermapper/src/main/java/org/apache/sling/serviceusermapping/impl/MappingConfigAmendment.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/serviceusermapper/src/main/java/org/apache/sling/serviceusermapping/impl/MappingConfigAmendment.java?rev=1784118&r1=1784117&r2=1784118&view=diff ============================================================================== --- sling/trunk/bundles/extensions/serviceusermapper/src/main/java/org/apache/sling/serviceusermapping/impl/MappingConfigAmendment.java (original) +++ sling/trunk/bundles/extensions/serviceusermapper/src/main/java/org/apache/sling/serviceusermapping/impl/MappingConfigAmendment.java Thu Feb 23 12:40:32 2017 @@ -68,19 +68,23 @@ public class MappingConfigAmendment impl void configure(final Config config) { final String[] props = config.user_mapping(); - final ArrayList mappings = new ArrayList(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 mappings = new ArrayList(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(); } Modified: sling/trunk/bundles/extensions/serviceusermapper/src/main/java/org/apache/sling/serviceusermapping/impl/ServiceUserMapperImpl.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/serviceusermapper/src/main/java/org/apache/sling/serviceusermapping/impl/ServiceUserMapperImpl.java?rev=1784118&r1=1784117&r2=1784118&view=diff ============================================================================== --- sling/trunk/bundles/extensions/serviceusermapper/src/main/java/org/apache/sling/serviceusermapping/impl/ServiceUserMapperImpl.java (original) +++ sling/trunk/bundles/extensions/serviceusermapper/src/main/java/org/apache/sling/serviceusermapping/impl/ServiceUserMapperImpl.java Thu Feb 23 12:40:32 2017 @@ -106,19 +106,23 @@ public class ServiceUserMapperImpl imple final String[] props = config.user_mapping(); - final ArrayList mappings = new ArrayList(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 mappings = new ArrayList(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;