| commit | 5ace5e5fa3828dfe17427f2ea8525e4686576581 | [log] [tgz] |
|---|---|---|
| author | David Jencks <djencks@apache.org> | Tue Mar 19 16:38:54 2013 +0000 |
| committer | David Jencks <djencks@apache.org> | Tue Mar 19 16:38:54 2013 +0000 |
| tree | d8e5c14ae5bfd719a477bb9edfbeab884593e408 | |
| parent | 4562b85439ec8182f3cb99523ed023e4afb47386 [diff] |
FELIX-3971 fix another NPE from ScrInfo when components are not active git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1458393 13f79535-47bb-0310-9956-ffa450edef68
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 3671050..e0035b0 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
@@ -180,7 +180,12 @@ public boolean isSatisfied() { - return isOptional() || !getTracker().isEmpty(); + if (isOptional()) + { + return true; + } + ServiceTracker<T, RefPair<T>> tracker = getTracker(); + return !(tracker == null) && !tracker.isEmpty(); } protected ServiceTracker<T, RefPair<T>> getTracker()