From 2e4089a2c2c2a973825c4fe52aee832e6e044695 Mon Sep 17 00:00:00 2001 From: Denis Fokin Date: Tue, 23 Aug 2011 17:56:14 +0400 Subject: [PATCH] 7072645: Toolkit.addPropertyChangeListener(name, pcl) throws NPE for null name Reviewed-by: art --- jdk/src/solaris/classes/sun/awt/X11/XToolkit.java | 4 ++++ jdk/src/windows/classes/sun/awt/windows/WToolkit.java | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/jdk/src/solaris/classes/sun/awt/X11/XToolkit.java b/jdk/src/solaris/classes/sun/awt/X11/XToolkit.java index 641d82180a9..9f29d734d5e 100644 --- a/jdk/src/solaris/classes/sun/awt/X11/XToolkit.java +++ b/jdk/src/solaris/classes/sun/awt/X11/XToolkit.java @@ -1532,6 +1532,10 @@ public final class XToolkit extends UNIXToolkit implements Runnable { } 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 --git a/jdk/src/windows/classes/sun/awt/windows/WToolkit.java b/jdk/src/windows/classes/sun/awt/windows/WToolkit.java index 57f889e72f9..26b234f1a9d 100644 --- a/jdk/src/windows/classes/sun/awt/windows/WToolkit.java +++ b/jdk/src/windows/classes/sun/awt/windows/WToolkit.java @@ -879,6 +879,10 @@ public class WToolkit extends SunToolkit implements Runnable { } 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))