[Patch] javax.swing.text.StyleContext

[Michael Koch]

Hi list,


I just merged the attached patch from GNU classpath to fix PR 21064 in
HEAD.


Michael


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

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

-------------- next part --------------
Index: javax/swing/text/StyleContext.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/text/StyleContext.java,v
retrieving revision 1.3
diff -u -r1.3 StyleContext.java
--- javax/swing/text/StyleContext.java	30 Nov 2004 23:59:08 -0000	1.3
+++ javax/swing/text/StyleContext.java	19 Apr 2005 10:47:48 -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();
     }