--- a/jdk/src/java.desktop/share/classes/javax/swing/text/AbstractWriter.java	Wed Jan 20 22:53:26 2016 +0100
+++ b/jdk/src/java.desktop/share/classes/javax/swing/text/AbstractWriter.java	Thu Jan 21 13:09:17 2016 +0530
@@ -441,7 +441,7 @@
             --offsetIndent;
         }
         else {
-            indentLevel--;
+            indentLevel = indentLevel > 0 ? indentLevel-- : 0;
         }
     }
 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/javax/swing/text/html/HTMLEditorKit/7104635/HTMLEditorKitWriterBug.java	Thu Jan 21 13:09:17 2016 +0530
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 7104635
+ * @summary HTMLEditorKit fails to write down some html files
+ * @run main HTMLEditorKitWriterBug
+ */
+import java.io.CharArrayReader;
+import java.io.CharArrayWriter;
+import javax.swing.text.html.HTMLDocument;
+import javax.swing.text.html.HTMLEditorKit;
+
+public class HTMLEditorKitWriterBug {
+
+    public static void main(String[] args) {
+        String htmlDoc = "<pre><p> </pre>";
+        try {
+            HTMLEditorKit kit = new HTMLEditorKit();
+            Class c = Class.forName(
+                    "javax.swing.text.html.parser.ParserDelegator");
+            HTMLEditorKit.Parser parser = (HTMLEditorKit.Parser) c.newInstance();
+            HTMLDocument doc = (HTMLDocument) kit.createDefaultDocument();
+            HTMLEditorKit.ParserCallback htmlReader = doc.getReader(0);
+            parser.parse(new CharArrayReader(htmlDoc.toCharArray()),
+                    htmlReader, true);
+            htmlReader.flush();
+            CharArrayWriter writer = new CharArrayWriter(1000);
+            kit.write(writer, doc, 0, doc.getLength());
+            writer.flush();
+        } catch (Exception ex) {
+            throw new RuntimeException("Test Failed " + ex);
+        }
+    }
+}