From 224bf60e3077ccba0a008805ef3aea70725f5cae Mon Sep 17 00:00:00 2001
From: Alexandr Scherbatiy <alexandr.scherbatiy@oracle.com>
Date: Mon, 17 Oct 2011 15:10:42 +0400
Subject: [PATCH] 7099251:
 javax.swing.text.html.HTMLDocument.insertAfterStart(null, something) throws
 NPE

Reviewed-by: rupashka
---
 .../share/classes/javax/swing/text/html/HTMLDocument.java  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/jdk/src/share/classes/javax/swing/text/html/HTMLDocument.java b/jdk/src/share/classes/javax/swing/text/html/HTMLDocument.java
index 5fc8c0f2bf4..a1f99e9cae8 100644
--- a/jdk/src/share/classes/javax/swing/text/html/HTMLDocument.java
+++ b/jdk/src/share/classes/javax/swing/text/html/HTMLDocument.java
@@ -1181,7 +1181,12 @@ public class HTMLDocument extends DefaultStyledDocument {
     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");
         }