You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by fm...@apache.org on 2009/06/12 13:12:20 UTC

svn commit: r784071 - /felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/SCRDescriptorMojo.java

Author: fmeschbe
Date: Fri Jun 12 11:12:20 2009
New Revision: 784071

URL: http://svn.apache.org/viewvc?rev=784071&view=rev
Log:
FELIX-1225 The pid attribute is needed and may not omitted (it will
later just be ignored by the MetaTypeService).

Modified:
    felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/SCRDescriptorMojo.java

Modified: felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/SCRDescriptorMojo.java
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/SCRDescriptorMojo.java?rev=784071&r1=784070&r2=784071&view=diff
==============================================================================
--- felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/SCRDescriptorMojo.java (original)
+++ felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/SCRDescriptorMojo.java Fri Jun 12 11:12:20 2009
@@ -434,10 +434,9 @@
             // designate
             final Designate designate = new Designate();
             metaData.addDesignate(designate);
-            if ( component.getFactory() != null ) {
-                designate.setFactoryPid(component.getName());
-            } else {
-                designate.setPid(component.getName());
+            designate.setPid(component.getName());
+            if (component.getFactory() != null) {
+                designate.setFactoryPid( component.getFactory() );
             }
             // designate.object
             final MTObject mtobject = new MTObject();