diff options
author | Thomas Watson | 2018-11-02 14:33:36 +0000 |
---|---|---|
committer | Thomas Watson | 2018-11-02 15:14:31 +0000 |
commit | f3ccda5cfa1154948319bf9f3857b11957863257 (patch) | |
tree | 21b9298b18015ea2b345e62513fe33de12c8f3cc | |
parent | 7d65c3565b61618454a809b02ea5d09d120db565 (diff) | |
download | rt.equinox.framework-f3ccda5cfa1154948319bf9f3857b11957863257.tar.gz rt.equinox.framework-f3ccda5cfa1154948319bf9f3857b11957863257.tar.xz rt.equinox.framework-f3ccda5cfa1154948319bf9f3857b11957863257.zip |
Bug 540323 - Need to catch Throwable to prevent <clinit> errorsI20181106-0125I20181105-1800I20181104-1800I20181103-1800I20181102-2120I20181102-1800
ServiceLoader.load can throw java.util.ServiceConfigurationError
Change-Id: Icf0b8f69a6f17e1244510168d345b23abd69a192
Signed-off-by: Thomas Watson <tjwatson@us.ibm.com>
-rw-r--r-- | bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/FrameworkUtil.java | 4 |
1 files changed, 2 insertions, 2 deletions
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 45f0f2dfe..8003880aa 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 @@ public class FrameworkUtil { 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); } |