2006-11-28 Roman Kennke <kennke@aicas.com>

	* javax/swing/JComponent.java
	(putClientProperty): Do not fire event when both old and new
	value are == null.

2 files changed, 12 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 3273adfe3..c2c2dbe39 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-11-28  Roman Kennke  <kennke@aicas.com>
+
+	* javax/swing/JComponent.java
+	(putClientProperty): Do not fire event when both old and new
+	value are == null.
+
 2006-11-27  Casey Marshall  <csm@gnu.org>
 
 	* java/util/jar/JarEntry.java (certs): removed.
diff --git a/javax/swing/JComponent.java b/javax/swing/JComponent.java
index 026d173ad..cc317492c 100644
--- a/javax/swing/JComponent.java
+++ b/javax/swing/JComponent.java
@@ -847,7 +847,12 @@ public abstract class JComponent extends Container implements Serializable
       t.put(key, value);
     else
       t.remove(key);
-    firePropertyChange(key.toString(), old, value);
+
+    // When both old and new value are null, no event is fired. This is
+    // different from what firePropertyChange() normally does, so we add this
+    // check here.
+    if (old != null || value != null)
+      firePropertyChange(key.toString(), old, value);
   }
 
   /**