changeset 3275:68049e855e07

RT-29615: StyleCacheEntry was returning SKIP in some cases where the key was not found. Let it return null instead.
author David Grieve<david.grieve@oracle.com>
date Wed, 10 Apr 2013 13:10:55 -0400
parents 4ddce863af36
children 6fbbe378550a
files javafx-ui-common/src/com/sun/javafx/css/StyleCacheEntry.java javafx-ui-common/src/javafx/scene/CssStyleHelper.java
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/javafx-ui-common/src/com/sun/javafx/css/StyleCacheEntry.java	Tue Apr 09 21:36:14 2013 -0400
+++ b/javafx-ui-common/src/com/sun/javafx/css/StyleCacheEntry.java	Wed Apr 10 13:10:55 2013 -0400
@@ -67,7 +67,7 @@
                 cv = ce.values.get(property);
             }
             // if referent is null, we should skip the value.
-            else cv = CalculatedValue.SKIP;
+            // else cv = CalculatedValue.SKIP;
         }
         return cv;
     }
--- a/javafx-ui-common/src/javafx/scene/CssStyleHelper.java	Tue Apr 09 21:36:14 2013 -0400
+++ b/javafx-ui-common/src/javafx/scene/CssStyleHelper.java	Wed Apr 10 13:10:55 2013 -0400
@@ -669,7 +669,7 @@
                 
                 // caclculatedValue may be null,
                 // but we should never put SKIP in cache.
-                assert(calculatedValue != SKIP);
+                assert calculatedValue != SKIP : "cache returned SKIP for " + property;
                 
             } else {
 
@@ -677,7 +677,7 @@
                         inlineStyles, node, fontForRelativeSizes, styleList);
 
                 // lookup is not supposed to return null.
-                assert(calculatedValue != null);
+                assert calculatedValue != null : "lookup returned null for " + property;
                 
             }