From 8f6293598e15cb1fba188682a2112d0984335d5d Mon Sep 17 00:00:00 2001 From: Michael Koch Date: Tue, 11 Jan 2005 13:24:19 +0000 Subject: 2005-01-11 Michael Koch * javax/swing/UIDefaults.java (put): Handle value of null. git-svn-id: https://gcc.gnu.org/svn/gcc/branches/java-gui-branch@93185 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/ChangeLog | 4 ++++ libjava/javax/swing/UIDefaults.java | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index c5862f2bb3a..db04e923b70 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,7 @@ +2005-01-11 Michael Koch + + * javax/swing/UIDefaults.java (put): Handle value of null. + 2005-01-11 Michael Koch * java/awt/Robot.java, diff --git a/libjava/javax/swing/UIDefaults.java b/libjava/javax/swing/UIDefaults.java index 0bd5f7399da..6af188afecd 100644 --- a/libjava/javax/swing/UIDefaults.java +++ b/libjava/javax/swing/UIDefaults.java @@ -286,7 +286,11 @@ public class UIDefaults extends Hashtable public Object put(Object key, Object value) { - Object old = super.put(key, value); + Object old; + if (value != null) + old = super.put(key, value); + else + old = super.remove(key); if (key instanceof String && old != value) firePropertyChange((String) key, old, value); return old; -- cgit v1.2.3