Browse Source

make comparision locale insensitive

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@909469 13f79535-47bb-0310-9956-ffa450edef68
master
Stefan Bodewig 15 years ago
parent
commit
49a001d9c9
1 changed files with 13 additions and 2 deletions
  1. +13
    -2
      src/main/org/apache/tools/zip/ZipEncodingHelper.java

+ 13
- 2
src/main/org/apache/tools/zip/ZipEncodingHelper.java View File

@@ -22,6 +22,7 @@ import java.nio.ByteBuffer;
import java.nio.charset.Charset;
import java.nio.charset.UnsupportedCharsetException;
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;

/**
@@ -190,6 +191,16 @@ abstract class ZipEncodingHelper {
*/
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
*/
@@ -239,7 +250,7 @@ abstract class ZipEncodingHelper {
// 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);
}
}

Loading…
Cancel
Save