incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jus...@apache.org
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 GMT
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]);



Mime
View raw message