another bugfix => YELLOW

refs 307

org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/MarkerService.java

@@ -57,7 +57,7 @@ import org.fortiss.tooling.kernel.ui.service.IMarkerService;
  * @author hoelzl
  * @author $Author$
  * @version $Rev$
- * @ConQAT.Rating YELLOW Hash: 242B488A1C4D7DDB614EB3E75F8D9294
+ * @ConQAT.Rating YELLOW Hash: 06F2B175D60D592B0950ADF9E0B00CCA
  */
 public class MarkerService implements IMarkerService,
 		IPersistencyServiceListener, ILightweightLabelDecorator {
@@ -158,7 +158,7 @@ public class MarkerService implements IMarkerService,
 		ITopLevelElement top = IPersistencyService.INSTANCE
 				.getTopLevelElementFor(element);
 		if (top == null) {
-			return null;
+			return ESeverity.lowest();
 		}
 		return getCacheEntry(top).getHighestSeverity(element);
 	}
@@ -318,10 +318,11 @@ public class MarkerService implements IMarkerService,
 
 		/** Returns the highest severity for the given element. */
 		public ESeverity getHighestSeverity(EObject element) {
-			if (!highestSeverityMap.containsKey(element)) {
+			ESeverity sev = highestSeverityMap.get(element);
+			if (sev == null) {
 				return ESeverity.lowest();
 			}
-			return highestSeverityMap.get(element);
+			return sev;
 		}
 
 		/** Updates the cache entry. */