Bug 552760 - Fixed NPE asking for Annotation image outside UI thread
Change-Id: I7858c11512ee267417c1ebcdecaf1f33de0fa08e
Signed-off-by: Niko Stotz <eclipse@nikostotz.de>
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/JavaAnnotationImageProvider.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/JavaAnnotationImageProvider.java
index 43dbcc0..bdc7af1 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/JavaAnnotationImageProvider.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/JavaAnnotationImageProvider.java
@@ -14,6 +14,7 @@
package org.eclipse.jdt.internal.ui.javaeditor;
import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Display;
import org.eclipse.jface.resource.ImageDescriptor;
@@ -139,6 +140,10 @@
if ((imageType == QUICKFIX_WARNING_IMAGE || imageType == QUICKFIX_ERROR_IMAGE || imageType == QUICKFIX_INFO_IMAGE) && fCachedImageType == imageType)
return fCachedImage;
+ if (Display.getCurrent() == null) {
+ return null;
+ }
+
Image image= null;
switch (imageType) {
case OVERLAY_IMAGE:
