7099251: javax.swing.text.html.HTMLDocument.insertAfterStart(null, something) throws NPE
authorrupashka
Mon, 17 Oct 2011 15:10:42 +0400
changeset 10867 bf858c670ee2
parent 10691 50cda9bfed7e
child 10868 d134ad3bc135
7099251: javax.swing.text.html.HTMLDocument.insertAfterStart(null, something) throws NPE Reviewed-by: rupashka Contributed-by: alexandr.scherbatiy@oracle.com
jdk/src/share/classes/javax/swing/text/html/HTMLDocument.java
--- a/jdk/src/share/classes/javax/swing/text/html/HTMLDocument.java	Tue Oct 11 15:22:40 2011 +0400
+++ b/jdk/src/share/classes/javax/swing/text/html/HTMLDocument.java	Mon Oct 17 15:10:42 2011 +0400
@@ -1181,7 +1181,12 @@
     public void insertAfterStart(Element elem, String htmlText) throws
                                  BadLocationException, IOException {
         verifyParser();
-        if (elem != null && elem.isLeaf()) {
+
+        if (elem == null || htmlText == null) {
+            return;
+        }
+
+        if (elem.isLeaf()) {
             throw new IllegalArgumentException
                 ("Can not insert HTML after start of a leaf");
         }