# HG changeset patch
# User rupashka
# Date 1288016747 -14400
# Node ID cd2a85b8534bc91b4ef21dd8bbf8a6eb5062bc9c
# Parent  0bac31837ad27d1bea2e00778289e7f0eb30cc22
6816582: WindowsFileChooserUI throws NullPointer when awt.useSystemAAFontSettings=false
Reviewed-by: uta

diff -r 0bac31837ad2 -r cd2a85b8534b jdk/src/share/classes/java/awt/Toolkit.java
--- a/jdk/src/share/classes/java/awt/Toolkit.java	Fri Oct 22 11:32:26 2010 -0700
+++ b/jdk/src/share/classes/java/awt/Toolkit.java	Mon Oct 25 18:25:47 2010 +0400
@@ -1831,7 +1831,11 @@
             desktopProperties.put(name, newValue);
         }
 
-        desktopPropsSupport.firePropertyChange(name, oldValue, newValue);
+        // Don't fire change event if old and new values are null.
+        // It helps to avoid recursive resending of WM_THEMECHANGED
+        if (oldValue != null || newValue != null) {
+            desktopPropsSupport.firePropertyChange(name, oldValue, newValue);
+        }
     }
 
     /**