Author: djencks
Date: Wed Nov 20 08:31:31 2013
New Revision: 1543734
URL: http://svn.apache.org/r1543734
Log:
FELIX-4322 Only report satsifed once the tracker is set up
Modified:
felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java
Modified:
felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java
URL:
http://svn.apache.org/viewvc/felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java?rev=1543734&r1=1543733&r2=1543734&view=diff
==============================================================================
---
felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java
(original)
+++
felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java
Wed Nov 20 08:31:31 2013
@@ -165,12 +165,16 @@ public class DependencyManager<S, T> imp
public boolean isSatisfied()
{
+ ServiceTracker<T, RefPair<T>> tracker = getTracker();
+ if ( tracker == null)
+ {
+ return false;
+ }
if (isOptional())
{
return true;
}
- ServiceTracker<T, RefPair<T>> tracker = getTracker();
- return !(tracker == null) && !tracker.isEmpty();
+ return !tracker.isEmpty();
}
protected ServiceTracker<T, RefPair<T>> getTracker()
