FELIX-5177: when we are losing a configuration, the dictionary is null, and we then should pass a null configuration proxy to callbacks that accept a proxy config.
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1729180 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/ConfigurationDependencyImpl.java b/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/ConfigurationDependencyImpl.java
index 1ada77f..face758 100644
--- a/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/ConfigurationDependencyImpl.java
+++ b/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/ConfigurationDependencyImpl.java
@@ -360,7 +360,10 @@
if (m_configType != null) {
Object configurable;
try {
- configurable = Configurable.create(m_configType, settings);
+ // if the configuration is null, it means we are losing it, and since we pass a null dictionary for other callback
+ // (that accepts a Dictionary), then we should have the same behavior and also pass a null conf proxy object when
+ // the configuration is lost.
+ configurable = settings != null ? Configurable.create(m_configType, settings) : null;
sigs = new Class[][] { { Dictionary.class }, { Component.class, Dictionary.class }, { Component.class, m_configType }, { m_configType }, {} };
args = new Object[][] { { settings }, { m_component, settings }, { m_component, configurable }, { configurable }, {} };