diff options
| author | Roman Kennke <roman@kennke.org> | 2005-04-19 10:52:03 +0000 |
|---|---|---|
| committer | Michael Koch <mkoch@gcc.gnu.org> | 2005-04-19 10:52:03 +0000 |
| commit | 6384325b3a550af1fce10cec27a1df32e7f9e616 (patch) | |
| tree | 95eb125f6665edb33f65df7e0d1fdeba65109013 | |
| parent | 69ae1f74fe940ceff1fcafb00b1f3b477a34f60d (diff) | |
| download | gcc-6384325b3a550af1fce10cec27a1df32e7f9e616.zip gcc-6384325b3a550af1fce10cec27a1df32e7f9e616.tar.gz gcc-6384325b3a550af1fce10cec27a1df32e7f9e616.tar.bz2 | |
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
| -rw-r--r-- | libjava/ChangeLog | 7 | ||||
| -rw-r--r-- | libjava/javax/swing/text/StyleContext.java | 6 |
2 files changed, 12 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 66ba74a..686453d 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 beb809b..86ccc11 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(); } |