diff options
Diffstat (limited to 'libjava/javax')
| -rw-r--r-- | libjava/javax/swing/text/StyleContext.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libjava/javax/swing/text/StyleContext.java b/libjava/javax/swing/text/StyleContext.java index beb809b89e4..86ccc112c11 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(); } |
