commit 4c66b4f94f435439948e1bfb1bb3827ceac0225d
author David Jencks <djencks@apache.org> Wed Nov 20 08:31:31 2013 +0000
committer David Jencks <djencks@apache.org> Wed Nov 20 08:31:31 2013 +0000
tree 43925f1b88ee900405ce26007a9fd3098c0882f4
parent 866f7e4064f31a149f190119e85318752a665edd

FELIX-4322 Only report satsifed once the tracker is set up

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

scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java

diff --git a/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java b/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java
index 99a87cf..87f846c 100644
--- a/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java
+++ b/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java
@@ -165,12 +165,16 @@
 
         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()