svn commit: r1401860 - /felix/trunk/metatype/src/main/java/org/apache/felix/metatype/internal/Activator.java

[fmeschbe]

Author: fmeschbe
Date: Wed Oct 24 20:23:43 2012
New Revision: 1401860

URL: http://svn.apache.org/viewvc?rev=1401860&view=rev
Log:
FELIX-3731 Support multi-value service.pid properties

Modified:
    
felix/trunk/metatype/src/main/java/org/apache/felix/metatype/internal/Activator.java

Modified: 
felix/trunk/metatype/src/main/java/org/apache/felix/metatype/internal/Activator.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/metatype/src/main/java/org/apache/felix/metatype/internal/Activator.java?rev=1401860&r1=1401859&r2=1401860&view=diff
==============================================================================
--- 
felix/trunk/metatype/src/main/java/org/apache/felix/metatype/internal/Activator.java
 (original)
+++ 
felix/trunk/metatype/src/main/java/org/apache/felix/metatype/internal/Activator.java
 Wed Oct 24 20:23:43 2012
@@ -192,8 +192,13 @@ public class Activator implements Bundle
 
         if ( sr != null )
         {
-            String name = ( String ) sr.getProperty( Constants.SERVICE_PID );
-            if ( name == null )
+            final String name;
+            String[] pids = ServiceMetaTypeInformation.getServicePids( sr );
+            if ( pids != null )
+            {
+                name = pids[0];
+            }
+            else
             {
                 name = ( ( String[] ) sr.getProperty( Constants.OBJECTCLASS ) 
)[0];
             }