Bug 540323 - Need to catch Throwable to prevent <clinit> errors
ServiceLoader.load can throw java.util.ServiceConfigurationError
Change-Id: Icf0b8f69a6f17e1244510168d345b23abd69a192
Signed-off-by: Thomas Watson <tjwatson@us.ibm.com>
diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/FrameworkUtil.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/FrameworkUtil.java
index 45f0f2d..8003880 100644
--- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/FrameworkUtil.java
+++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/FrameworkUtil.java
@@ -198,9 +198,9 @@
for (Iterator<FrameworkUtilHelper> iHelpers = helperLoader.iterator(); iHelpers.hasNext();) {
l.add(iHelpers.next());
}
- } catch (Exception e) {
+ } catch (Throwable t) {
// should not fail out of static initializers
- e.printStackTrace();
+ t.printStackTrace();
}
helpers = Collections.unmodifiableList(l);
}
