Index: javax/swing/text/SimpleAttributeSet.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/text/SimpleAttributeSet.java,v
retrieving revision 1.6
diff -u -r1.6 SimpleAttributeSet.java
--- javax/swing/text/SimpleAttributeSet.java	17 Apr 2005 18:56:29 -0000	1.6
+++ javax/swing/text/SimpleAttributeSet.java	17 Apr 2005 21:14:19 -0000
@@ -63,10 +63,7 @@
 
   public void addAttribute(Object name, Object value)
   {
-    if (value == null)
-      tab.remove(name);
-    else
-      tab.put(name, value);
+    tab.put(name, value);
   }
 
   public void addAttributes(AttributeSet attributes)
Index: javax/swing/text/StyleContext.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/text/StyleContext.java,v
retrieving revision 1.2
diff -u -r1.2 StyleContext.java
--- javax/swing/text/StyleContext.java	22 Oct 2004 12:44:01 -0000	1.2
+++ javax/swing/text/StyleContext.java	17 Apr 2005 21:14:19 -0000
@@ -203,7 +203,11 @@
 
     public void setResolveParent(AttributeSet parent)
     {
-      attributes = StyleContext.this.addAttribute(attributes, ResolveAttribute, parent);
+      if (parent != null)
+        {
+          attributes = StyleContext.this.addAttribute
+            (attributes, ResolveAttribute, parent);
+        }
       fireStateChanged();
     }