From: mkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Tue, 19 Apr 2005 10:52:03 +0000 (+0000)
Subject: 2005-04-19  Roman Kennke  <roman@kennke.org>
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9caa1b6f5f45464674eaa37b3065d5b4cb592961;p=thirdparty%2Fgcc.git

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

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


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@98402 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 66ba74a3469d..686453de5de7 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,10 @@
+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:
diff --git a/libjava/javax/swing/text/StyleContext.java b/libjava/javax/swing/text/StyleContext.java
index beb809b89e48..86ccc112c116 100644
--- a/libjava/javax/swing/text/StyleContext.java
+++ b/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();
     }