Bug 418811 - NPE possible for creating a class loader from uninstalled bundleI20131009-0430I20131008-2330

1 files changed, 2 insertions, 0 deletions

diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleDatabase.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleDatabase.java
index 619d8448c..2c4feb5a4 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleDatabase.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleDatabase.java
@@ -394,6 +394,7 @@ public class ModuleDatabase {
 				// remove any wires from unresolved wirings that got removed
 				for (Map.Entry<ModuleWiring, Collection<ModuleWire>> entry : toRemoveWireLists.entrySet()) {
 					List<ModuleWire> provided = entry.getKey().getProvidedModuleWires(null);
+					// No null checks; we are holding the write lock here.
 					provided.removeAll(entry.getValue());
 					entry.getKey().setProvidedWires(provided);
 					for (ModuleWire removedWire : entry.getValue()) {
@@ -612,6 +613,7 @@ public class ModuleDatabase {
 			if (wiring == null) {
 				continue;
 			}
+			// No null check; we are holding the database lock here.
 			for (ModuleWire wire : wiring.getRequiredModuleWires(null)) {
 				ModuleRequirement req = wire.getRequirement();
 				// Add all requirements that are not package requirements.