# HG changeset patch
# User denis
# Date 1314107774 -14400
# Node ID dbbded066362eadfdb9523469b25ac7b8056ef74
# Parent  923af0e3ba369620a2f2d73d7566f950910bf0a4
7072645: Toolkit.addPropertyChangeListener(name, pcl) throws NPE for null name
Reviewed-by: art

diff -r 923af0e3ba36 -r dbbded066362 jdk/src/solaris/classes/sun/awt/X11/XToolkit.java
--- a/jdk/src/solaris/classes/sun/awt/X11/XToolkit.java	Wed Aug 17 22:47:37 2011 -0700
+++ b/jdk/src/solaris/classes/sun/awt/X11/XToolkit.java	Tue Aug 23 17:56:14 2011 +0400
@@ -1532,6 +1532,10 @@
     }
 
     public synchronized void addPropertyChangeListener(String name, PropertyChangeListener pcl) {
+        if (name == null) {
+            // See JavaDoc for the Toolkit.addPropertyChangeListener() method
+            return;
+        }
         initXSettingsIfNeeded(name);
         super.addPropertyChangeListener(name, pcl);
     }
diff -r 923af0e3ba36 -r dbbded066362 jdk/src/windows/classes/sun/awt/windows/WToolkit.java
--- a/jdk/src/windows/classes/sun/awt/windows/WToolkit.java	Wed Aug 17 22:47:37 2011 -0700
+++ b/jdk/src/windows/classes/sun/awt/windows/WToolkit.java	Tue Aug 23 17:56:14 2011 +0400
@@ -879,6 +879,10 @@
     }
 
     public synchronized void addPropertyChangeListener(String name, PropertyChangeListener pcl) {
+        if (name == null) {
+            // See JavaDoc for the Toolkit.addPropertyChangeListener() method
+            return;
+        }
         if ( WDesktopProperties.isWindowsProperty(name)
              || name.startsWith(awtPrefix)
              || name.startsWith(dndPrefix))