FELIX-3726 Update the target filters in the Unsatisfied.activate method to ensure not binding or verifying inappropriare references. Remove commented call to target filter update from verifyDependencyManagers method: the update is to be done done before calling this method.
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1400076 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/scr/src/main/java/org/apache/felix/scr/impl/manager/AbstractComponentManager.java b/scr/src/main/java/org/apache/felix/scr/impl/manager/AbstractComponentManager.java
index b82d9c4..030af8a 100644
--- a/scr/src/main/java/org/apache/felix/scr/impl/manager/AbstractComponentManager.java
+++ b/scr/src/main/java/org/apache/felix/scr/impl/manager/AbstractComponentManager.java
@@ -1079,9 +1079,6 @@
{
DependencyManager dm = ( DependencyManager ) it.next();
- // ensure the target filter is correctly set
-// dm.setTargetFilter( properties );
-
if ( !dm.hasGetPermission() )
{
// bundle has no service get permission
@@ -1543,6 +1540,10 @@
return true;
}
+ // Update our target filters.
+ acm.log( LogService.LOG_DEBUG, "Updating target filters", null );
+ acm.updateTargets( acm.getProperties() );
+
// Before creating the implementation object, we are going to
// test if all the mandatory dependencies are satisfied
if ( !acm.verifyDependencyManagers( acm.getProperties() ) )