Author: pderop
Date: Mon Jan 4 11:30:01 2016
New Revision: 1722851
URL: http://svn.apache.org/viewvc?rev=1722851&view=rev
Log:
Added comments.
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/FilterComponent.java
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/FilterComponent.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/FilterComponent.java?rev=1722851&r1=1722850&r2=1722851&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/FilterComponent.java
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/FilterComponent.java
Mon Jan 4 11:30:01 2016
@@ -90,6 +90,10 @@ public class FilterComponent implements
if (dc.isRequired()) {
allDependenciesOptional = false;
}
+
+ // Temporarily remove dependency callback instance (if set),
because we don't want to call it twice (one time from the
+ // internal aspect/adapter AbstractDecorator object, and another
one time from the actual aspect/adapter component instances).
+ // See FELIX-5155.
if (dc.getCallbackInstance() != null) {
m_dependencyCallbacks.put(dc, dc.setCallbackInstance(null));
}