From 6384325b3a550af1fce10cec27a1df32e7f9e616 Mon Sep 17 00:00:00 2001 From: Roman Kennke Date: Tue, 19 Apr 2005 10:52:03 +0000 Subject: re PR libgcj/21064 ([4.0 only] StyleContext.addStyle causes NullPointerException) 2005-04-19 Roman Kennke PR libgcj/21064 * javax/swing/text/StyleContext.java (NamedStyle.setResolveParent): Added null pointer check. From-SVN: r98402 --- libjava/ChangeLog | 7 +++++++ libjava/javax/swing/text/StyleContext.java | 6 +++++- 2 files changed, 12 insertions(+), 1 deletion(-) 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 + + PR libgcj/21064 + * javax/swing/text/StyleContext.java + (NamedStyle.setResolveParent): Added null + pointer check. + 2005-04-19 Michael Koch * 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(); } -- cgit v1.1