changeset 1640:3edd0328371a 8.0-b52

Fix for NPE I introduced in Stylesheet class.
author jgiles
date Mon, 20 Aug 2012 19:06:59 +1200
parents acfbded4d07f
children 077bf884c38c a28f59575d5d 0f18a668cf80
files javafx-ui-common/src/com/sun/javafx/css/Stylesheet.java
diffstat 1 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/javafx-ui-common/src/com/sun/javafx/css/Stylesheet.java	Mon Aug 20 15:23:11 2012 +1200
+++ b/javafx-ui-common/src/com/sun/javafx/css/Stylesheet.java	Mon Aug 20 19:06:59 2012 +1200
@@ -145,6 +145,8 @@
             
             if (this.url == null && other.url == null) {
                 return true;
+            } else if (this.url == null || other.url == null) {
+                return false;
             } else {
                 // convert to Strings, as URL.equals is slow. See here:
                 // http://michaelscharf.blogspot.com/2006/11/javaneturlequals-and-hashcode-make.html