2005-11-16 Anthony Balkissoon <abalkiss@redhat.com>

	* javax/swing/text/PlainDocument.java:
	(insertString): Null check fixes PR 24890.

2 files changed, 6 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 634468a0a..a4898fa4a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-16  Anthony Balkissoon  <abalkiss@redhat.com>
+
+	* javax/swing/text/PlainDocument.java:
+	(insertString): Null check fixes PR 24890.
+
 2005-11-16  Lillian Angel  <langel@redhat.com>
 
 	* javax/swing/plaf/basic/BasicTreeUI.java
diff --git a/javax/swing/text/PlainDocument.java b/javax/swing/text/PlainDocument.java
index bed40e4ca..0c00a06ff 100644
--- a/javax/swing/text/PlainDocument.java
+++ b/javax/swing/text/PlainDocument.java
@@ -235,7 +235,7 @@ public class PlainDocument extends AbstractDocument
     throws BadLocationException
   {
     String string = str;
-    if (Boolean.TRUE.equals(getProperty("filterNewlines")))
+    if (str != null && Boolean.TRUE.equals(getProperty("filterNewlines")))
       string = str.replaceAll("\n", " ");
     super.insertString(offs, string, atts);
   }