re PR libgcj/21064 ([4.0 only] StyleContext.addStyle causes NullPointerException)

2005-04-19  Roman Kennke  <roman@kennke.org>

	PR libgcj/21064
	* javax/swing/text/StyleContext.java
	(NamedStyle.setResolveParent): Added null
	pointer check.

From-SVN: r98402

libjava/ChangeLog

+2005-04-19  Roman Kennke  <roman@kennke.org>
+
+	PR libgcj/21064
+	* javax/swing/text/StyleContext.java
+	(NamedStyle.setResolveParent): Added null
+	pointer check.
+
 2005-04-19  Michael Koch  <konqueror@gmx.de>
 
 	* java/rmi/server/RemoteObject.java:

libjava/javax/swing/text/StyleContext.java

@@ -203,7 +203,11 @@ public class StyleContext
 
     public void setResolveParent(AttributeSet parent)
     {
-      attributes = StyleContext.this.addAttribute(attributes, ResolveAttribute, parent);
+      if (parent != null)
+        {
+          attributes = StyleContext.this.addAttribute
+            (attributes, ResolveAttribute, parent);
+        }
       fireStateChanged();
     }