Bug 552475 - applyHighlights(): Guard against null annotation modelI20191105-0025I20191104-1800I20191103-1800I20191102-1800I20191101-1800I20191101-0300I20191031-1800I20191031-1325I20191030-1800I20191030-0010I20191029-1800I20191028-1800

sourceViewer.getAnnotationModel() might return null, which could cause a
NPE when not guarded. Also set fOccurrenceAnnotations to null when no
current annotation model is present.

Change-Id: Id37edf61ddfb8bbfb329b4282386e30095400190
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>

1 files changed, 14 insertions, 10 deletions

diff --git a/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/DefaultWordHighlightStrategy.java b/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/DefaultWordHighlightStrategy.java
index d5bdcbadd8b..f7385d7810e 100644
--- a/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/DefaultWordHighlightStrategy.java
+++ b/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/DefaultWordHighlightStrategy.java
@@ -105,18 +105,22 @@ public class DefaultWordHighlightStrategy implements IReconcilingStrategy, IReco
 		}
 
 		IAnnotationModel annotationModel = sourceViewer.getAnnotationModel();
-		synchronized (getLockObject(annotationModel)) {
-			if (annotationModel instanceof IAnnotationModelExtension) {
-				((IAnnotationModelExtension) annotationModel).replaceAnnotations(fOccurrenceAnnotations, annotationMap);
-			} else {
-				removeOccurrenceAnnotations();
-				Iterator<Entry<Annotation, Position>> iter = annotationMap.entrySet().iterator();
-				while (iter.hasNext()) {
-					Entry<Annotation, Position> mapEntry = iter.next();
-					annotationModel.addAnnotation(mapEntry.getKey(), mapEntry.getValue());
+		if (annotationModel != null) {
+			synchronized (getLockObject(annotationModel)) {
+				if (annotationModel instanceof IAnnotationModelExtension) {
+					((IAnnotationModelExtension) annotationModel).replaceAnnotations(fOccurrenceAnnotations, annotationMap);
+				} else {
+					removeOccurrenceAnnotations();
+					Iterator<Entry<Annotation, Position>> iter = annotationMap.entrySet().iterator();
+					while (iter.hasNext()) {
+						Entry<Annotation, Position> mapEntry = iter.next();
+						annotationModel.addAnnotation(mapEntry.getKey(), mapEntry.getValue());
+					}
 				}
+				fOccurrenceAnnotations = annotationMap.keySet().toArray(new Annotation[annotationMap.keySet().size()]);
 			}
-			fOccurrenceAnnotations = annotationMap.keySet().toArray(new Annotation[annotationMap.keySet().size()]);
+		} else {
+			fOccurrenceAnnotations = null;
 		}
 	}