src/com/sun/org/apache/xml/internal/serializer/ToHTMLStream.java

@@ -56,11 +56,11 @@
 
     /**
      * Map that tells which XML characters should have special treatment, and it
      *  provides character to entity name lookup.
      */
-    private final CharInfo m_htmlcharInfo =
+    private static final CharInfo m_htmlcharInfo =
 //        new CharInfo(CharInfo.HTML_ENTITIES_RESOURCE);
         CharInfo.getCharInfo(CharInfo.HTML_ENTITIES_RESOURCE, Method.HTML);
 
     /** A digital search trie for fast, case insensitive lookup of ElemDesc objects. */
     static final Trie m_elementFlags = new Trie();

@@ -1367,11 +1367,11 @@
 
             // System.out.println("SPECIALSSIZE: "+SPECIALSSIZE);
             // System.out.println("ch: "+(int)ch);
             // System.out.println("m_maxCharacter: "+(int)m_maxCharacter);
             // System.out.println("m_attrCharsMap[ch]: "+(int)m_attrCharsMap[ch]);
-            if (escapingNotNeeded(ch) && (!m_charInfo.shouldMapAttrChar(ch)))
+            if (escapingNotNeeded(ch) && (!m_charInfo.isSpecialAttrChar(ch)))
             {
                 cleanLength++;
             }
             else if ('<' == ch || '>' == ch)
             {