mirrors/gcc
0
0
Fork 0
mirror of https://gcc.gnu.org/git/gcc.git synced 2025-01-18 10:24:30 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

re PR libgcj/21064 ([4.0 only] StyleContext.addStyle causes NullPointerException)

Browse Source 
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:
Roman Kennke 2005-04-19 10:52:03 +00:00 committed by Michael Koch
parent 69ae1f74fe
commit 6384325b3a
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libjava/ChangeLog
View File

@ -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> 2005-04-19 Michael Koch <konqueror@gmx.de>
* java/rmi/server/RemoteObject.java: * java/rmi/server/RemoteObject.java:

6
libjava/javax/swing/text/StyleContext.java
View File

@ -203,7 +203,11 @@ public class StyleContext
public void setResolveParent(AttributeSet parent) public void setResolveParent(AttributeSet parent)
{ {
attributes = StyleContext.this.addAttribute(attributes, ResolveAttribute, parent); if (parent != null)
{
attributes = StyleContext.this.addAttribute
(attributes, ResolveAttribute, parent);
}
fireStateChanged(); fireStateChanged();
} }