Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Watson2013-09-23 11:35:47 -0400
committerThomas Watson2013-09-23 11:35:47 -0400
commitb0050c572f18b9830b32887967833c1d8003710b (patch)
tree62b7f5b55b020d57895e6ab4d927409fd965cea6
parent34c0d973195f8456d95a9cc105feaed4eaf976fd (diff)
downloadrt.equinox.framework-b0050c572f18b9830b32887967833c1d8003710b.tar.gz
rt.equinox.framework-b0050c572f18b9830b32887967833c1d8003710b.tar.xz
rt.equinox.framework-b0050c572f18b9830b32887967833c1d8003710b.zip
Bug 417843 - NPE possible in dynamic resolution if bundle becomes
unresolved
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleContainer.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleContainer.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleContainer.java
index d42350e7b..1bc4c350d 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleContainer.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleContainer.java
@@ -653,12 +653,12 @@ public final class ModuleContainer {
// TODO Will likely need to optimize this
if ((revision.getTypes() & BundleRevision.TYPE_FRAGMENT) != 0) {
// only do this for hosts
- return null;
+ return Collections.emptyList();
}
ModuleWiring wiring = revision.getWiring();
if (wiring == null) {
// not resolved!
- return null;
+ return Collections.emptyList();
}
List<DynamicModuleRequirement> result = new ArrayList<ModuleRequirement.DynamicModuleRequirement>(1);
// check the dynamic import packages

Back to the top