commit fea1484bb99633655821abbb4f211325aa8e5013
author Marcel Offermans <marrs@apache.org> Thu Oct 14 14:45:36 2010 +0000
committer Marcel Offermans <marrs@apache.org> Thu Oct 14 14:45:36 2010 +0000
tree 4f8bb9dfffc6141466ba91457d0a665de6cf369d
parent 0acdb1b00aff2262778f956d2f02b0d897984851

More fixes for instance bound callbacks.

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

dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/ServiceDependencyImpl.java

diff --git a/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/ServiceDependencyImpl.java b/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/ServiceDependencyImpl.java
index e698a6a..dc7474b 100644
--- a/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/ServiceDependencyImpl.java
+++ b/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/ServiceDependencyImpl.java
@@ -422,6 +422,9 @@
         for (int i = 0; i < services.length; i++) {
             DependencyService ds = (DependencyService) services[i];
             if (makeAvailable) {
+                if (ds.isInstantiated() && isInstanceBound() && isRequired()) {
+                    invokeAdded(ds, ref, service);
+                }
                 // The dependency callback will be defered until all required dependency are available.
                 ds.dependencyAvailable(this);
                 if (!isRequired()) {
@@ -469,7 +472,7 @@
             DependencyService ds = (DependencyService) services[i];
             if (makeUnavailable) {
                 ds.dependencyUnavailable(this);
-                if (!isRequired()) {
+                if (!isRequired() || (ds.isInstantiated() && isInstanceBound())) {
                     invokeRemoved(ds, ref, service);
                 }
             }