You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ma...@apache.org on 2011/07/27 11:44:09 UTC
svn commit: r1151402 -
/felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/index/BundleContextInterceptor.java
Author: marrs
Date: Wed Jul 27 09:44:09 2011
New Revision: 1151402
URL: http://svn.apache.org/viewvc?rev=1151402&view=rev
Log:
FELIX-3057 fixed the bug
Modified:
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/index/BundleContextInterceptor.java
Modified: felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/index/BundleContextInterceptor.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/index/BundleContextInterceptor.java?rev=1151402&r1=1151401&r2=1151402&view=diff
==============================================================================
--- felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/index/BundleContextInterceptor.java (original)
+++ felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/index/BundleContextInterceptor.java Wed Jul 27 09:44:09 2011
@@ -89,6 +89,9 @@ public class BundleContextInterceptor ex
}
}
}
+ if (result == null || result.size() == 0) {
+ return null;
+ }
return (ServiceReference[]) result.toArray(new ServiceReference[result.size()]);
}
else {
@@ -102,6 +105,9 @@ public class BundleContextInterceptor ex
FilterIndex filterIndex = m_cache.hasFilterIndexFor(clazz, filter);
if (filterIndex != null) {
List /* <ServiceReference> */ result = filterIndex.getAllServiceReferences(clazz, filter);
+ if (result == null || result.size() == 0) {
+ return null;
+ }
return (ServiceReference[]) result.toArray(new ServiceReference[result.size()]);
}
else {