changeset 4868:ec82a5c0079b

fix NPE in CssStyleHelper found while running Shapes3DSceneLightTester
author David Grieve<david.grieve@oracle.com>
date Tue, 03 Sep 2013 12:13:17 -0400
parents 20c49dd998fd
children e0f3abebc024
files modules/graphics/src/main/java/javafx/scene/CssStyleHelper.java
diffstat 1 files changed, 1 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/modules/graphics/src/main/java/javafx/scene/CssStyleHelper.java	Tue Sep 03 10:54:35 2013 -0400
+++ b/modules/graphics/src/main/java/javafx/scene/CssStyleHelper.java	Tue Sep 03 12:13:17 2013 -0400
@@ -1625,6 +1625,7 @@
             if (fpOrigin == StyleOrigin.USER) {
                 origin = fpOrigin;
                 Font font = styleableProp.getValue();
+                if (font == null) font = Font.getDefault();
                 family = getFontFamily(font);
                 size = font.getSize();
                 weight = getFontWeight(font);