Skip to content

Commit 77d4b13

Browse files
Alex Ciminianthegreystone
authored andcommitted
6833: Tolerate exceptions when loading images
Reviewed-by: hirt
1 parent 2edae36 commit 77d4b13

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

application/org.openjdk.jmc.ui/src/main/java/org/openjdk/jmc/ui/misc/ActionUiToolkit.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
import org.eclipse.jface.action.IAction;
3939
import org.eclipse.jface.action.ToolBarManager;
4040
import org.eclipse.jface.preference.JFacePreferences;
41+
import org.eclipse.jface.resource.DeviceResourceException;
4142
import org.eclipse.jface.resource.ImageDescriptor;
4243
import org.eclipse.jface.resource.JFaceResources;
4344
import org.eclipse.jface.resource.LocalResourceManager;
@@ -77,7 +78,14 @@ public String getToolTipText(Object element) {
7778
@Override
7879
public Image getImage(Object element) {
7980
ImageDescriptor icon = ((IAction) element).getImageDescriptor();
80-
return icon == null ? null : manager.createImage(icon);
81+
try {
82+
if (icon != null) {
83+
return manager.createImage(icon);
84+
}
85+
} catch (DeviceResourceException e) {
86+
return null;
87+
}
88+
return null;
8189
}
8290

8391
@Override

0 commit comments

Comments
 (0)