cvs commit: xml-xalan/src/org/apache/xalan/xpath/xml FormatterToXML.java

[sboag]

sboag       00/10/12 14:55:19

  Modified:    src/org/apache/xalan/xpath/xml FormatterToXML.java
  Log:
  Fixed dang bug with unknown encodings, now we revert to UTF-8, and output 
that to the xml decl.
  
  Revision  Changes    Path
  1.38      +6 -1      
xml-xalan/src/org/apache/xalan/xpath/xml/FormatterToXML.java
  
  Index: FormatterToXML.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/src/org/apache/xalan/xpath/xml/FormatterToXML.java,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- FormatterToXML.java       2000/10/12 20:57:41     1.37
  +++ FormatterToXML.java       2000/10/12 21:55:18     1.38
  @@ -515,6 +515,7 @@
               System.out.println(" or "+javaEncoding);
             else
               System.out.println();
  +          m_encoding = "UTF-8";
             osw = new OutputStreamWriter(output);
           }
         }
  @@ -1828,7 +1829,11 @@
       }
       
       if (null == encoding)
  -      throw new 
UnsupportedEncodingException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_UNSUPPORTED_ENCODING,
 new Object[] {mimeCharsetName}));
  +    {
  +      // m_encoding = "UTF-8";
  +      return null;
  +      // throw new 
UnsupportedEncodingException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_UNSUPPORTED_ENCODING,
 new Object[] {mimeCharsetName}));
  +    }
       else 
         return encoding;
     }