[sling-org-apache-sling-fsresource] 02/16: SLING-1516 Fixed by looking for a factory pid on activation.

[ro...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to annotated tag org.apache.sling.fsresource-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-fsresource.git

commit feb247390bbf826dd5d0e2ae614834cb21dd23a9
Author: Ian Boston <ie...@apache.org>
AuthorDate: Tue May 4 02:49:33 2010 +0000

    SLING-1516 Fixed by looking for a factory pid on activation.
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/fsresource@940718 13f79535-47bb-0310-9956-ffa450edef68
---
 .../org/apache/sling/fsprovider/internal/FsResourceProvider.java   | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java b/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java
index dd7b740..857d523 100644
--- a/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java
+++ b/src/main/java/org/apache/sling/fsprovider/internal/FsResourceProvider.java
@@ -201,6 +201,13 @@ public class FsResourceProvider implements ResourceProvider {
 
     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");

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.