commit 9ace4f4a4723e80b55265624636c9a8b95e922bd
author Marcel Offermans <marrs@apache.org> Tue Feb 16 16:25:38 2010 +0000
committer Marcel Offermans <marrs@apache.org> Tue Feb 16 16:25:38 2010 +0000
tree d750ed219505ab6d618004eb8a74a633602c1ad4
parent d665eaff96fb47d8cc4b964e98ade876c12c69c8

Tested filter for null before using it.

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

dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/BundleDependencyImpl.java

diff --git a/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/BundleDependencyImpl.java b/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/BundleDependencyImpl.java
index 8bb09b9..12b6332 100644
--- a/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/BundleDependencyImpl.java
+++ b/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/BundleDependencyImpl.java
@@ -393,7 +393,12 @@
             Bundle[] bundles = m_context.getBundles();
             for (int i = 0; i < bundles.length; i++) {
                 if ((bundles[i].getState() & m_stateMask) > 0) {
-                    if (m_filter.match(bundles[i].getHeaders())) {
+                    Filter filter = m_filter;
+                    if (filter == null) {
+                        service = bundles[i];
+                        break;
+                    }
+                    else if (filter.match(bundles[i].getHeaders())) {
                         service = bundles[i];
                         break;
                     }