You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commons-cvs@xml.apache.org by mr...@apache.org on 2008/11/08 06:54:03 UTC
svn commit: r712354 - in
/xml/commons/trunk/java/src/org/apache/xml/resolver: Catalog.java
readers/TR9401CatalogReader.java readers/TextCatalogReader.java
Author: mrglavas
Date: Fri Nov 7 21:54:03 2008
New Revision: 712354
URL: http://svn.apache.org/viewvc?rev=712354&view=rev
Log:
When normalizing a String object to upper- or lower case one needs to be very careful not to rely on the default locale of the platform. This results from the fact that Turkish in particular does not map characters to their upper- or lower case equivalents in English. Now, everywhere where this could pose a problem, we force case conversion to be done according to an English locale.
Modified:
xml/commons/trunk/java/src/org/apache/xml/resolver/Catalog.java
xml/commons/trunk/java/src/org/apache/xml/resolver/readers/TR9401CatalogReader.java
xml/commons/trunk/java/src/org/apache/xml/resolver/readers/TextCatalogReader.java
Modified: xml/commons/trunk/java/src/org/apache/xml/resolver/Catalog.java
URL: http://svn.apache.org/viewvc/xml/commons/trunk/java/src/org/apache/xml/resolver/Catalog.java?rev=712354&r1=712353&r2=712354&view=diff
==============================================================================
--- xml/commons/trunk/java/src/org/apache/xml/resolver/Catalog.java (original)
+++ xml/commons/trunk/java/src/org/apache/xml/resolver/Catalog.java Fri Nov 7 21:54:03 2008
@@ -28,6 +28,7 @@
import java.util.Enumeration;
import java.util.Hashtable;
+import java.util.Locale;
import java.util.Vector;
import java.net.URL;
@@ -2161,7 +2162,7 @@
* @return The %-encoded string for the byte in question.
*/
protected String encodedByte (int b) {
- String hex = Integer.toHexString(b).toUpperCase();
+ String hex = Integer.toHexString(b).toUpperCase(Locale.ENGLISH);
if (hex.length() < 2) {
return "%0" + hex;
} else {
Modified: xml/commons/trunk/java/src/org/apache/xml/resolver/readers/TR9401CatalogReader.java
URL: http://svn.apache.org/viewvc/xml/commons/trunk/java/src/org/apache/xml/resolver/readers/TR9401CatalogReader.java?rev=712354&r1=712353&r2=712354&view=diff
==============================================================================
--- xml/commons/trunk/java/src/org/apache/xml/resolver/readers/TR9401CatalogReader.java (original)
+++ xml/commons/trunk/java/src/org/apache/xml/resolver/readers/TR9401CatalogReader.java Fri Nov 7 21:54:03 2008
@@ -22,6 +22,7 @@
import java.io.InputStream;
import java.io.IOException;
import java.net.MalformedURLException;
+import java.util.Locale;
import java.util.Vector;
import org.apache.xml.resolver.Catalog;
import org.apache.xml.resolver.CatalogEntry;
@@ -94,7 +95,7 @@
if (caseSensitive) {
entryToken = token;
} else {
- entryToken = token.toUpperCase();
+ entryToken = token.toUpperCase(Locale.ENGLISH);
}
if (entryToken.equals("DELEGATE")) {
Modified: xml/commons/trunk/java/src/org/apache/xml/resolver/readers/TextCatalogReader.java
URL: http://svn.apache.org/viewvc/xml/commons/trunk/java/src/org/apache/xml/resolver/readers/TextCatalogReader.java?rev=712354&r1=712353&r2=712354&view=diff
==============================================================================
--- xml/commons/trunk/java/src/org/apache/xml/resolver/readers/TextCatalogReader.java (original)
+++ xml/commons/trunk/java/src/org/apache/xml/resolver/readers/TextCatalogReader.java Fri Nov 7 21:54:03 2008
@@ -25,6 +25,7 @@
import java.net.URL;
import java.net.URLConnection;
import java.net.MalformedURLException;
+import java.util.Locale;
import java.util.Vector;
import java.util.Stack;
import org.apache.xml.resolver.Catalog;
@@ -137,7 +138,7 @@
if (caseSensitive) {
entryToken = token;
} else {
- entryToken = token.toUpperCase();
+ entryToken = token.toUpperCase(Locale.ENGLISH);
}
try {