commit 62b86a3d339d273886cda692fe3b8f094353e5f0
author David Jencks <djencks@apache.org> Sun Jun 15 01:10:10 2014 +0000
committer David Jencks <djencks@apache.org> Sun Jun 15 01:10:10 2014 +0000
tree 548c0842c6feceb144500ff253b9175ed28263a1
parent 9f3f02eeddb0b033cddf57e4dd21fd8993ddcee8

FELIX-4536 implement multivalued pid property

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1602644 13f79535-47bb-0310-9956-ffa450edef68

scr/src/main/java/org/apache/felix/scr/impl/config/ConfigurableComponentHolder.java

diff --git a/scr/src/main/java/org/apache/felix/scr/impl/config/ConfigurableComponentHolder.java b/scr/src/main/java/org/apache/felix/scr/impl/config/ConfigurableComponentHolder.java
index a4d1f32..91f6f92 100644
--- a/scr/src/main/java/org/apache/felix/scr/impl/config/ConfigurableComponentHolder.java
+++ b/scr/src/main/java/org/apache/felix/scr/impl/config/ConfigurableComponentHolder.java
@@ -39,6 +39,7 @@
 import org.apache.felix.scr.impl.manager.ServiceFactoryComponentManager;
 import org.apache.felix.scr.impl.metadata.ComponentMetadata;
 import org.apache.felix.scr.impl.metadata.ServiceMetadata.Scope;
+import org.osgi.framework.Constants;
 import org.osgi.service.component.ComponentConstants;
 import org.osgi.service.log.LogService;
 
@@ -417,19 +418,40 @@
     }
 
     private Map<String, Object> mergeProperties(String servicePid) {
-        Map<String, Object> properties;
-        properties = new HashMap<String, Object>(m_componentMetadata.getProperties());
+        Map<String, Object> properties = new HashMap<String, Object>(m_componentMetadata.getProperties());
+        List<String> pids = null;
+        boolean isDS13 = m_componentMetadata.isDS13();
+        if (isDS13)
+        {
+            pids = new ArrayList<String>();
+            if (properties.get(Constants.SERVICE_PID) instanceof String)
+            {
+                pids.add((String) properties.get(Constants.SERVICE_PID));
+            }
+        }
         for (int i = 0; i < m_configurations.length; i++)
         {
             if ( m_factoryPidIndex != null && i == m_factoryPidIndex)
             {
                 copyTo(properties, m_factoryConfigurations.get(servicePid));
+                if (isDS13)
+                {
+                    pids.add((String) m_factoryConfigurations.get(servicePid).get(Constants.SERVICE_PID));
+                }
             }
             else if ( m_configurations[i] != null )
             {
                 copyTo(properties, m_configurations[i]);
+                if (isDS13)
+                {
+                    pids.add((String) m_configurations[i].get(Constants.SERVICE_PID));
+                }
             }
         }
+        if (isDS13 && !pids.isEmpty())
+        {
+            properties.put(Constants.SERVICE_PID, pids);
+        }
         return properties;
     }