commit acf8cd9f79aeed371afa771633a80f303965577e
author Felix Meschberger <fmeschbe@apache.org> Fri Jun 12 11:15:34 2009 +0000
committer Felix Meschberger <fmeschbe@apache.org> Fri Jun 12 11:15:34 2009 +0000
tree 481a1d263580c3bffb745488937e76531da51491
parent 0972fa95cf74fae5200362c85966f0de17e784ee

FELIX-1226 For building the pid and factoryPid lists, the pid attribute
of a Designate element is to be ignored if the factoryPid attribute is set

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

metatype/src/main/java/org/apache/felix/metatype/internal/MetaTypeInformationImpl.java

diff --git a/metatype/src/main/java/org/apache/felix/metatype/internal/MetaTypeInformationImpl.java b/metatype/src/main/java/org/apache/felix/metatype/internal/MetaTypeInformationImpl.java
index b3f3c33..3bb923a 100644
--- a/metatype/src/main/java/org/apache/felix/metatype/internal/MetaTypeInformationImpl.java
+++ b/metatype/src/main/java/org/apache/felix/metatype/internal/MetaTypeInformationImpl.java
@@ -163,9 +163,10 @@
                 }
 
                 // gather pids and factory pids
-                this.pids.add(designate.getPid());
                 if (designate.getFactoryPid() != null) {
                     this.factoryPids.add( designate.getFactoryPid() );
+                } else {
+                    this.pids.add(designate.getPid());
                 }
 
                 // register a metatype provider for the pid