Author: pderop
Date: Sat Dec 19 18:03:37 2015
New Revision: 1720964
URL: http://svn.apache.org/viewvc?rev=1720964&view=rev
Log:
FELIX-5147: Bundle Adapter auto configures class fields even if callbacks are
used.
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/BundleAdapterImpl.java
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/BundleAdapterImpl.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/BundleAdapterImpl.java?rev=1720964&r1=1720963&r2=1720964&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/BundleAdapterImpl.java
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/BundleAdapterImpl.java
Sat Dec 19 18:03:37 2015
@@ -53,7 +53,7 @@ public class BundleAdapterImpl extends F
.setFilter(filter)
.setStateMask(stateMask)
.setCallbacks("added", "removed"))
- .setCallbacks("init", null, "stop", null);
+ .setCallbacks("init", null, "stop", null);
}
public class BundleAdapterDecorator extends AbstractDecorator {
@@ -101,8 +101,7 @@ public class BundleAdapterImpl extends F
.setBundle(bundle)
.setStateMask(m_bundleStateMask)
.setPropagate(m_propagate)
- .setCallbacks(m_cbInstance, m_add, m_change, m_remove)
- .setAutoConfig(true)
+ .setCallbacks(m_cbInstance, m_add, m_change, m_remove) //
if no callbacks, autoconfig is enabled
.setRequired(true));
for (DependencyContext dc : dependencies) {