svn commit: r940732 - /sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java

[ieb]

Author: ieb
Date: Tue May  4 05:49:09 2010
New Revision: 940732

URL: http://svn.apache.org/viewvc?rev=940732&view=rev
Log:
SLING-1516  A much better fix provided by Felix.

Modified:
    
sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java

Modified: 
sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java?rev=940732&r1=940731&r2=940732&view=diff
==============================================================================
--- 
sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java
 (original)
+++ 
sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java
 Tue May  4 05:49:09 2010
@@ -49,6 +49,7 @@ import org.osgi.service.event.EventAdmin
  *                label="%resource.resolver.name"
  *                description="%resource.resolver.description"
  *                configurationFactory="true"
+ *                policy="require"
  * @scr.service interface="ResourceProvider"
  * @scr.property name="service.description" value="Sling Filesystem Resource
  *               Provider"
@@ -200,14 +201,6 @@ public class FsResourceProvider implemen
     // ---------- SCR Integration
 
     protected void activate(BundleContext bundleContext, Map<?, ?> props) {
-
-        String serviceFactoryPid = (String) props.get("service.factoryPid");
-        if ( serviceFactoryPid == null ) {
-            // this is the activate for the Alias PID and not the configured 
service, therefore we should not
-            // do anything here, see OSGi 4.2 compendium v1.1 section 115.3.1 
for more details.
-            return;
-        }
-
         String providerRoot = (String) props.get(ROOTS);
         if (providerRoot == null || providerRoot.length() == 0) {
             throw new IllegalArgumentException(ROOTS + " property must be 
set");