svn commit: r1479678 - /felix/trunk/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/IPojoFactory.java

[cl...@apache.org]

Author: clement
Date: Mon May  6 19:00:21 2013
New Revision: 1479678

URL: http://svn.apache.org/r1479678
Log:
Fix FELIX-4054
https://issues.apache.org/jira/browse/FELIX-4054

Modified:
    felix/trunk/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/IPojoFactory.java

Modified: felix/trunk/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/IPojoFactory.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/IPojoFactory.java?rev=1479678&r1=1479677&r2=1479678&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/IPojoFactory.java (original)
+++ felix/trunk/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/IPojoFactory.java Mon May  6 19:00:21 2013
@@ -288,6 +288,11 @@ public abstract class IPojoFactory imple
         // We extract the version from the configuration because it may help to compute a unique name by appending
         // the version to the given name.
         String version = (String) configuration.get(Factory.FACTORY_VERSION_PROPERTY);
+
+        // If the extracted version is null, we use the current factory version (as we were called)
+        if (version == null) {
+            version = m_version;
+        }
         name = m_generator.generate(name, version);
         configuration.put(Factory.INSTANCE_NAME_PROPERTY, name);