| commit | b96ecaa5ace2c6edd5e08c7cb6aa630992e5a461 | [log] [tgz] |
|---|---|---|
| author | Andrey Loskutov <loskutov@gmx.de> | Fri Jan 21 10:35:34 2022 +0100 |
| committer | Andrey Loskutov <loskutov@gmx.de> | Fri Jan 21 05:00:37 2022 -0500 |
| tree | 52cc7437e95853aa697b8e982499fa787e3c8863 | |
| parent | 2a735980f649f352a023aa29d66ce8136e02b3b0 [diff] |
Bug 578305 - NPE in getImage(IAdaptable) Change-Id: I7e1b688a8b365375ccf5531d4631525ee2f661c0 Signed-off-by: Andrey Loskutov <loskutov@gmx.de> Reviewed-on: https://git.eclipse.org/r/c/platform/eclipse.platform.team/+/189865 Tested-by: Platform Bot <platform-bot@eclipse.org>
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java index 9f8c8a7..276d0ca 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java
@@ -736,6 +736,9 @@ public static Image getImage(IAdaptable adaptable) { if (adaptable != null) { IWorkbenchAdapter o= Adapters.adapt(adaptable, IWorkbenchAdapter.class); + if (o == null) { + return null; + } ImageDescriptor id= o.getImageDescriptor(adaptable); if (id != null) { Image image= fgImages2.get(id);