| commit | aa5adb982b2b685d5afd3c43a87f823a2fc70f2b | [log] [tgz] |
|---|---|---|
| author | Felix Meschberger <fmeschbe@apache.org> | Thu Sep 06 08:37:44 2007 +0000 |
| committer | Felix Meschberger <fmeschbe@apache.org> | Thu Sep 06 08:37:44 2007 +0000 |
| tree | ecaa7f509f182a2f3031191f6a12c8cda4f2c777 | |
| parent | 86a336d1d3464f49050f56c945c5d9d04b968eb1 [diff] |
FELIX-356 DependencyManager.bind may bind to null and does not correctly check for success ( we also have to check whether the reference is multiple or not ) git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@573179 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/scr/src/main/java/org/apache/felix/scr/DependencyManager.java b/scr/src/main/java/org/apache/felix/scr/DependencyManager.java index 9dbb4c2..b8a0085 100644 --- a/scr/src/main/java/org/apache/felix/scr/DependencyManager.java +++ b/scr/src/main/java/org/apache/felix/scr/DependencyManager.java
@@ -307,6 +307,12 @@ // we have at least on service bound success = true; + + // if the reference is not multiple, we are already done + if ( !m_dependencyMetadata.isMultiple() ) + { + break; + } } // success will be true, if the service is optional or if at least