Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Watson2009-05-20 15:06:14 -0400
committerThomas Watson2009-05-20 15:06:14 -0400
commitd4540aaf0c9dcedfddf18c2a8790c417bb115324 (patch)
tree6a561d7b7d54891dc11fecda90da69960fb51ef8 /bundles/org.eclipse.osgi/resolver
parent1c660b47fa306d6f13eab457bedd4dfe4b47003b (diff)
downloadrt.equinox.framework-d4540aaf0c9dcedfddf18c2a8790c417bb115324.tar.gz
rt.equinox.framework-d4540aaf0c9dcedfddf18c2a8790c417bb115324.tar.xz
rt.equinox.framework-d4540aaf0c9dcedfddf18c2a8790c417bb115324.zip
Bug 266935 NullPointerException in org.eclipse.osgi.internal.module.ResolverImpl.unresolveBundle() during Initializing Java Toolingv20090520
Diffstat (limited to 'bundles/org.eclipse.osgi/resolver')
-rw-r--r--bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/StateImpl.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/StateImpl.java b/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/StateImpl.java
index 5f897d500..b64c0270d 100644
--- a/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/StateImpl.java
+++ b/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/StateImpl.java
@@ -154,7 +154,8 @@ public abstract class StateImpl implements State {
public boolean removeBundle(BundleDescription toRemove) {
synchronized (this.monitor) {
- if (!bundleDescriptions.remove((KeyedElement) toRemove))
+ toRemove = (BundleDescription) bundleDescriptions.get((KeyedElement) toRemove);
+ if (toRemove == null || !bundleDescriptions.remove((KeyedElement) toRemove))
return false;
resolvedBundles.remove((KeyedElement) toRemove);
disabledBundles.remove(toRemove);

Back to the top