| commit | a860873d014091f4483fdbd48949dd941ffc5cff | [log] [tgz] |
|---|---|---|
| author | Clement Escoffier <clement@apache.org> | Mon May 06 19:00:21 2013 +0000 |
| committer | Clement Escoffier <clement@apache.org> | Mon May 06 19:00:21 2013 +0000 |
| tree | 7d92aac5e83e32899cae2f3df28506021d24f2f5 | |
| parent | f1dbd488b6afd56a1c707017210b397cc7d504ff [diff] |
Fix FELIX-4054 https://issues.apache.org/jira/browse/FELIX-4054 git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1479678 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/IPojoFactory.java b/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/IPojoFactory.java index 2d08991..dee0bdf 100644 --- a/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/IPojoFactory.java +++ b/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/IPojoFactory.java
@@ -288,6 +288,11 @@ // 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);