commit 225cfedaa18d13edab0c4b0c196740d13396dbcf
author Dani Megert <dmegert> Wed Nov 05 08:28:43 2003 +0000
committer Dani Megert <dmegert> Wed Nov 05 08:28:43 2003 +0000
tree 4389ebf86057d554414f7bdeebdb0444d054881a
parent 55f5dc72c6ddd23d484ea90507d6518e9c0e8f64

Fixed bug 46042: NPE in preference store, called from JavaAnnotationHover.getJavaAnnotationsForLine

org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/JavaAnnotationHover.java

diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/JavaAnnotationHover.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/JavaAnnotationHover.java
index 83fdc06..7234d31 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/JavaAnnotationHover.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/JavaAnnotationHover.java
@@ -120,7 +120,7 @@
 						continue;
 				} else if (VERTICAL_RULER_HOVER.equals(fType)) {
 					AnnotationPreference preference= getAnnotationPreference(a.getAnnotationType());
-					if (preference == null || !fStore.getBoolean(preference.getVerticalRulerPreferenceKey()))
+					if (preference == null || preference.getVerticalRulerPreferenceKey() != null && !fStore.getBoolean(preference.getVerticalRulerPreferenceKey()))
 						continue;
 				}