svn commit: r1546540 - in /felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies: BundleDependencyImpl.java ServiceDependencyImpl.java

[pderop]

Author: pderop
Date: Fri Nov 29 11:10:00 2013
New Revision: 1546540

URL: http://svn.apache.org/r1546540
Log:
FELIX-4334: When a dependency is modified, the component "change" callback must 
be invoked
if the dependency service "isInstantiated()" method is true. Indeed, changed 
callbacks
shall be invoked even if the component is in the "waiting for required 
(instantiated)" state.

Modified:
    
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/BundleDependencyImpl.java
    
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/ServiceDependencyImpl.java

Modified: 
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/BundleDependencyImpl.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/BundleDependencyImpl.java?rev=1546540&r1=1546539&r2=1546540&view=diff
==============================================================================
--- 
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/BundleDependencyImpl.java
 (original)
+++ 
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/BundleDependencyImpl.java
 Fri Nov 29 11:10:00 2013
@@ -193,7 +193,7 @@ public class BundleDependencyImpl extend
         for (int i = 0; i < services.length; i++) {
             DependencyService ds = (DependencyService) services[i];
             ds.dependencyChanged(this);
-            if (ds.isRegistered()) {
+            if (ds.isInstantiated()) {
                 invokeChanged(ds, bundle);
             }
         }

Modified: 
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/ServiceDependencyImpl.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/ServiceDependencyImpl.java?rev=1546540&r1=1546539&r2=1546540&view=diff
==============================================================================
--- 
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/ServiceDependencyImpl.java
 (original)
+++ 
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/ServiceDependencyImpl.java
 Fri Nov 29 11:10:00 2013
@@ -837,7 +837,7 @@ public class ServiceDependencyImpl exten
         for (int i = 0; i < services.length; i++) {
             DependencyService ds = (DependencyService) services[i];
             ds.dependencyChanged(this);
-            if (ds.isRegistered()) {
+            if (ds.isInstantiated()) {
                 invokeChanged(ds, ref, service);
             }
         }