Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Watson2010-08-06 10:00:21 -0400
committerThomas Watson2010-08-06 10:00:21 -0400
commit64c805237221b22f719ff5b9786648dc0bb5475b (patch)
treee2a29c002f58981955aa1b3163b02f36f4a0f641
parentf6388152f6af05ff9f33858522954c65af967be6 (diff)
downloadrt.equinox.framework-64c805237221b22f719ff5b9786648dc0bb5475b.tar.gz
rt.equinox.framework-64c805237221b22f719ff5b9786648dc0bb5475b.tar.xz
rt.equinox.framework-64c805237221b22f719ff5b9786648dc0bb5475b.zip
Bug 321942 - Eclipse will not Launch with certain .bundledata.## file in ORG.ECLIPSE.OSGI folder
-rw-r--r--bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/internal/baseadaptor/BaseStorage.java10
1 files changed, 9 insertions, 1 deletions
diff --git a/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/internal/baseadaptor/BaseStorage.java b/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/internal/baseadaptor/BaseStorage.java
index 82263d10b..5d197d583 100644
--- a/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/internal/baseadaptor/BaseStorage.java
+++ b/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/internal/baseadaptor/BaseStorage.java
@@ -340,7 +340,15 @@ public class BaseStorage implements SynchronousBundleListener {
}
public BaseData[] getInstalledBundles() {
- return readBundleDatas();
+ try {
+ return readBundleDatas();
+ } catch (Throwable t) {
+ // be safe here and throw out the results and start over
+ // otherwise this would result in a failed launch
+ FrameworkLogEntry logEntry = new FrameworkLogEntry(FrameworkAdaptor.FRAMEWORK_SYMBOLICNAME, FrameworkLogEntry.ERROR, 0, "Error loading bundle datas. Recalculating cache.", 0, t, null); //$NON-NLS-1$
+ adaptor.getFrameworkLog().log(logEntry);
+ return null;
+ }
}
private BaseData[] readBundleDatas() {

Back to the top