commit e04b687cbe38e550529a3454d26e5b77eb42c1ca
author Pierre De Rop <pderop@apache.org> Mon Jan 04 11:30:01 2016 +0000
committer Pierre De Rop <pderop@apache.org> Mon Jan 04 11:30:01 2016 +0000
tree 1156ba7f69fa46c4852f9b31b13ec6bd0532ffbd
parent 2c3aeababaa69c2680fe5f212dc3d15b2025595b

Added comments.


git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1722851 13f79535-47bb-0310-9956-ffa450edef68

dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/FilterComponent.java

diff --git a/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/FilterComponent.java b/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/FilterComponent.java
index 3e52f0c..c86265c 100644
--- a/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/FilterComponent.java
+++ b/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/FilterComponent.java
@@ -90,6 +90,10 @@
             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));
             }