diff options
author | DJ Houghton | 2008-03-17 20:10:30 +0000 |
---|---|---|
committer | DJ Houghton | 2008-03-17 20:10:30 +0000 |
commit | ed95a0ef2bf591f7d35b558a5977b23f75cb73ec (patch) | |
tree | ca63f2be8f900d0c8e3d46f984a20f56d8f2debb /bundles/org.eclipse.equinox.frameworkadmin | |
parent | 7570d4f81754db544a5a00af5f6e4d261268d62f (diff) | |
download | rt.equinox.p2-ed95a0ef2bf591f7d35b558a5977b23f75cb73ec.tar.gz rt.equinox.p2-ed95a0ef2bf591f7d35b558a5977b23f75cb73ec.tar.xz rt.equinox.p2-ed95a0ef2bf591f7d35b558a5977b23f75cb73ec.zip |
Bug 222871 - Some test plugins not found
- protect against NPE
Diffstat (limited to 'bundles/org.eclipse.equinox.frameworkadmin')
-rw-r--r-- | bundles/org.eclipse.equinox.frameworkadmin/src/org/eclipse/equinox/internal/frameworkadmin/utils/SimpleBundlesState.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/bundles/org.eclipse.equinox.frameworkadmin/src/org/eclipse/equinox/internal/frameworkadmin/utils/SimpleBundlesState.java b/bundles/org.eclipse.equinox.frameworkadmin/src/org/eclipse/equinox/internal/frameworkadmin/utils/SimpleBundlesState.java index 8d2ce4199..f0f4f4523 100644 --- a/bundles/org.eclipse.equinox.frameworkadmin/src/org/eclipse/equinox/internal/frameworkadmin/utils/SimpleBundlesState.java +++ b/bundles/org.eclipse.equinox.frameworkadmin/src/org/eclipse/equinox/internal/frameworkadmin/utils/SimpleBundlesState.java @@ -11,10 +11,8 @@ package org.eclipse.equinox.internal.frameworkadmin.utils; import java.io.File; -import java.io.IOException; import java.net.MalformedURLException; import java.util.*; - import org.eclipse.equinox.internal.provisional.frameworkadmin.*; import org.osgi.framework.Constants; @@ -244,6 +242,10 @@ public class SimpleBundlesState implements BundlesState { String newLocation = bInfo.getLocation(); Dictionary newManifest = Utils.getOSGiManifest(newLocation); + if (newManifest == null) { + // TODO log something here + return; + } String newSymbolicName = (String) newManifest.get(Constants.BUNDLE_SYMBOLICNAME); String newVersion = (String) newManifest.get(Constants.BUNDLE_VERSION); //System.out.println("> currentInstalledBundles.length=" + currentInstalledBundles.length); |