svn commit: r1400076 - /felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/AbstractComponentManager.java

[fm...@apache.org]

Author: fmeschbe
Date: Fri Oct 19 12:58:19 2012
New Revision: 1400076

URL: http://svn.apache.org/viewvc?rev=1400076&view=rev
Log:
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.

Modified:
    felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/AbstractComponentManager.java

Modified: felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/AbstractComponentManager.java
URL: http://svn.apache.org/viewvc/felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/AbstractComponentManager.java?rev=1400076&r1=1400075&r2=1400076&view=diff
==============================================================================
--- felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/AbstractComponentManager.java (original)
+++ felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/AbstractComponentManager.java Fri Oct 19 12:58:19 2012
@@ -1079,9 +1079,6 @@ public abstract class AbstractComponentM
         {
             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 @@ public abstract class AbstractComponentM
                 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() ) )