You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by fm...@apache.org on 2007/09/06 10:37:45 UTC
svn commit: r573179 -
/felix/trunk/scr/src/main/java/org/apache/felix/scr/DependencyManager.java
Author: fmeschbe
Date: Thu Sep 6 01:37:44 2007
New Revision: 573179
URL: http://svn.apache.org/viewvc?rev=573179&view=rev
Log:
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 )
Modified:
felix/trunk/scr/src/main/java/org/apache/felix/scr/DependencyManager.java
Modified: felix/trunk/scr/src/main/java/org/apache/felix/scr/DependencyManager.java
URL: http://svn.apache.org/viewvc/felix/trunk/scr/src/main/java/org/apache/felix/scr/DependencyManager.java?rev=573179&r1=573178&r2=573179&view=diff
==============================================================================
--- felix/trunk/scr/src/main/java/org/apache/felix/scr/DependencyManager.java (original)
+++ felix/trunk/scr/src/main/java/org/apache/felix/scr/DependencyManager.java Thu Sep 6 01:37:44 2007
@@ -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