Bug 551692 - Avoid NPE in applyCSSPropertyColor
When newColor is null this might lead to NPE later when using this
variable as method args. Changed guard condition to return when newColor
is null.
Change-Id: I36da7b089c6384e72c648aafd3bedb1d008a2871
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
diff --git a/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/properties/css2/CSSPropertyTextSWTHandler.java b/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/properties/css2/CSSPropertyTextSWTHandler.java
index 0653133..b099009 100644
--- a/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/properties/css2/CSSPropertyTextSWTHandler.java
+++ b/bundles/org.eclipse.e4.ui.css.swt/src/org/eclipse/e4/ui/css/swt/properties/css2/CSSPropertyTextSWTHandler.java
@@ -63,7 +63,7 @@
Widget widget = (Widget) element;
Color newColor = (Color) engine.convert(value, Color.class, widget.getDisplay());
- if (newColor != null && newColor.isDisposed() || value.getCssValueType() != CSSValue.CSS_PRIMITIVE_VALUE) {
+ if (newColor == null || newColor.isDisposed() || value.getCssValueType() != CSSValue.CSS_PRIMITIVE_VALUE) {
return;
}
