Author: bodewig
Date: Fri Feb 12 15:49:57 2010
New Revision: 909469
URL: http://svn.apache.org/viewvc?rev=909469&view=rev
Log:
make comparision locale insensitive
Modified:
ant/core/trunk/src/main/org/apache/tools/zip/ZipEncodingHelper.java
(contents, props changed)
Modified: ant/core/trunk/src/main/org/apache/tools/zip/ZipEncodingHelper.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/zip/ZipEncodingHelper.java?rev=909469&r1=909468&r2=909469&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/zip/ZipEncodingHelper.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/zip/ZipEncodingHelper.java Fri Feb
12 15:49:57 2010
@@ -22,6 +22,7 @@
import java.nio.charset.Charset;
import java.nio.charset.UnsupportedCharsetException;
import java.util.HashMap;
+import java.util.Locale;
import java.util.Map;
/**
@@ -191,6 +192,16 @@
static final String UTF8 = "UTF8";
/**
+ * name of the encoding UTF-8 used for comparisions.
+ */
+ private static final String UTF8_LC = UTF8.toLowerCase(Locale.ENGLISH);
+
+ /**
+ * variant name of the encoding UTF-8 used for comparisions.
+ */
+ private static final String UTF_DASH_8_LC = "utf-8";
+
+ /**
* name of the encoding UTF-8
*/
static final ZipEncoding UTF8_ZIP_ENCODING = new FallbackZipEncoding(UTF8);
@@ -239,7 +250,7 @@
// check platform's default encoding
encoding = System.getProperty("file.encoding");
}
- return UTF8.equalsIgnoreCase(encoding)
- || "utf-8".equalsIgnoreCase(encoding);
+ String enc = encoding.toLowerCase(Locale.ENGLISH);
+ return UTF8_LC.equals(enc) || UTF_DASH_8_LC.equals(enc);
}
}
Propchange: ant/core/trunk/src/main/org/apache/tools/zip/ZipEncodingHelper.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 12 15:49:57 2010
@@ -1,2 +1,3 @@
/ant/core/trunk/src/main/org/apache/tools/zip/ZipEncodingHelper.java:738844,739300,741089
+/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipEncodingHelper.java:909456
/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipEncodingHelper.java:746933,747841,748133,749342-749344,749524,749855,749859
