Return-Path: X-Original-To: apmail-sling-commits-archive@www.apache.org Delivered-To: apmail-sling-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A8C687F93 for ; Sat, 12 Nov 2011 01:38:22 +0000 (UTC) Received: (qmail 68929 invoked by uid 500); 12 Nov 2011 01:38:22 -0000 Delivered-To: apmail-sling-commits-archive@sling.apache.org Received: (qmail 68880 invoked by uid 500); 12 Nov 2011 01:38:22 -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 68873 invoked by uid 99); 12 Nov 2011 01:38:22 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 12 Nov 2011 01:38:22 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 12 Nov 2011 01:38:21 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 026DB23888FD; Sat, 12 Nov 2011 01:38:01 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1201150 - /sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceResolverFactoryImpl.java Date: Sat, 12 Nov 2011 01:38:00 -0000 To: commits@sling.apache.org From: justin@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111112013801.026DB23888FD@eris.apache.org> Author: justin Date: Sat Nov 12 01:38:00 2011 New Revision: 1201150 URL: http://svn.apache.org/viewvc?rev=1201150&view=rev Log: SLING-2209 - fixing some minor errors in annotation conversion Modified: sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceResolverFactoryImpl.java Modified: sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceResolverFactoryImpl.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceResolverFactoryImpl.java?rev=1201150&r1=1201149&r2=1201150&view=diff ============================================================================== --- sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceResolverFactoryImpl.java (original) +++ sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceResolverFactoryImpl.java Sat Nov 12 01:38:00 2011 @@ -80,7 +80,7 @@ import org.slf4j.LoggerFactory; * First attempt of an resource resolver factory implementation. * WORK IN PROGRESS - see SLING-1262 */ -@Component(immediate=true, label="%resource.resolver.name", description="%resource.resolver.description", specVersion="1.1") +@Component(immediate=true, label="%resource.resolver.name", description="%resource.resolver.description", specVersion="1.1", metatype=true) @Service(value={JcrResourceResolverFactory.class, ResourceResolverFactory.class}) @Properties({ @Property(name = Constants.SERVICE_DESCRIPTION, value="Sling JcrResourceResolverFactory Implementation"), @@ -402,7 +402,7 @@ public class JcrResourceResolverFactoryI final Dictionary properties = componentContext.getProperties(); BidiMap virtuals = new TreeBidiMap(); - String[] virtualList = (String[]) properties.get(PROP_VIRTUAL); + String[] virtualList = OsgiUtil.toStringArray(properties.get(PROP_VIRTUAL)); for (int i = 0; virtualList != null && i < virtualList.length; i++) { String[] parts = Mapping.split(virtualList[i]); virtuals.put(parts[0], parts[2]);