diff options
| author | Andrey Loskutov | 2022-01-21 09:35:34 +0000 |
|---|---|---|
| committer | Andrey Loskutov | 2022-01-21 10:00:37 +0000 |
| commit | b96ecaa5ace2c6edd5e08c7cb6aa630992e5a461 (patch) | |
| tree | 52cc7437e95853aa697b8e982499fa787e3c8863 | |
| parent | 2a735980f649f352a023aa29d66ce8136e02b3b0 (diff) | |
| download | eclipse.platform.team-b96ecaa5ace2c6edd5e08c7cb6aa630992e5a461.tar.gz eclipse.platform.team-b96ecaa5ace2c6edd5e08c7cb6aa630992e5a461.tar.xz eclipse.platform.team-b96ecaa5ace2c6edd5e08c7cb6aa630992e5a461.zip | |
Bug 578305 - NPE in getImage(IAdaptable)Y20220203-0600Y20220202-0910Y20220202-0600Y20220201-0600Y20220129-0600Y20220128-0600Y20220127-0600Y20220126-0600Y20220125-0600Y20220124-0600Y20220123-0600Y20220122-0600Y20220121-0600I20220203-1640I20220203-1550I20220203-1310I20220203-0300I20220202-1800I20220202-0620I20220201-1800I20220201-0310I20220131-0800I20220131-0700I20220129-1800I20220128-1800I20220127-1800I20220126-1800I20220126-0520I20220125-1800I20220125-0320I20220124-0510I20220123-1800I20220122-1800I20220121-1800
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>
| -rw-r--r-- | bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java | 3 |
1 files changed, 3 insertions, 0 deletions
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 9f8c8a74b..276d0ca70 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 final class CompareUIPlugin extends AbstractUIPlugin { 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); |