neilg 2003/06/13 15:31:06
Modified: java/src/org/apache/xerces/util EncodingMap.java
Log:
fix for bug #9102. This assumes that, in JDK 1.4, ISO8859_15 is an alias for
ISO8859_15_FDIS. This seems like a safe assumption, so this should fix the problem in
1.3.x and have no ramifications for 1.4.x users
Revision Changes Path
1.15 +4 -3 xml-xerces/java/src/org/apache/xerces/util/EncodingMap.java
Index: EncodingMap.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/util/EncodingMap.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- EncodingMap.java 27 Nov 2002 20:12:13 -0000 1.14
+++ EncodingMap.java 13 Jun 2003 22:31:05 -0000 1.15
@@ -807,8 +807,8 @@
fIANA2JavaMap.put("CSISOLATIN5", "ISO8859_9");
fIANA2JavaMap.put("L5", "ISO8859_9");
- fIANA2JavaMap.put("ISO-8859-15", "ISO8859_15");
- fIANA2JavaMap.put("ISO_8859-15", "ISO8859_15");
+ fIANA2JavaMap.put("ISO-8859-15", "ISO8859_15_FDIS");
+ fIANA2JavaMap.put("ISO_8859-15", "ISO8859_15_FDIS");
fIANA2JavaMap.put("KOI8-R", "KOI8_R");
fIANA2JavaMap.put("CSKOI8R", "KOI8_R");
@@ -898,6 +898,7 @@
fJava2IANAMap.put("ISO8859_8", "ISO-8859-8");
fJava2IANAMap.put("ISO8859_9", "ISO-8859-9");
fJava2IANAMap.put("ISO8859_15", "ISO-8859-15");
+ fJava2IANAMap.put("ISO8859_15_FDIS", "ISO-8859-15");
fJava2IANAMap.put("Big5", "BIG5");
fJava2IANAMap.put("CP037", "EBCDIC-CP-US");
fJava2IANAMap.put("CP273", "IBM273");
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
