mirror of
https://gcc.gnu.org/git/gcc.git
synced 2025-01-18 10:24:30 +08:00
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
This commit is contained in:
parent
69ae1f74fe
commit
6384325b3a
@ -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:
|
||||
|
@ -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();
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user