diff -r 937aa020c667 -r bd51ca92c013 src/share/classes/com/sun/tools/doclets/formats/html/markup/StringContent.java --- a/src/share/classes/com/sun/tools/doclets/formats/html/markup/StringContent.java Tue May 14 10:14:55 2013 -0700 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/markup/StringContent.java Tue May 14 10:14:55 2013 -0700 @@ -58,8 +58,8 @@ * @param initialContent initial content for the object */ public StringContent(String initialContent) { - stringContent = new StringBuilder( - Util.escapeHtmlChars(nullCheck(initialContent))); + stringContent = new StringBuilder(); + appendChars(initialContent); } /** @@ -81,7 +81,7 @@ * @param strContent string content to be added */ public void addContent(String strContent) { - stringContent.append(Util.escapeHtmlChars(nullCheck(strContent))); + appendChars(strContent); } /** @@ -111,4 +111,16 @@ out.write(s); return s.endsWith(DocletConstants.NL); } + + private void appendChars(String s) { + for (int i = 0; i < s.length(); i++) { + char ch = s.charAt(i); + switch (ch) { + case '<': stringContent.append("<"); break; + case '>': stringContent.append(">"); break; + case '&': stringContent.append("&"); break; + default: stringContent.append(ch); break; + } + } + } }