From 49a001d9c973f2a283712f0dd803f9900d488d65 Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Fri, 12 Feb 2010 15:49:57 +0000
Subject: [PATCH] make comparision locale insensitive

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@909469 13f79535-47bb-0310-9956-ffa450edef68
---
 .../org/apache/tools/zip/ZipEncodingHelper.java   | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/main/org/apache/tools/zip/ZipEncodingHelper.java b/src/main/org/apache/tools/zip/ZipEncodingHelper.java
index bb07d9caa..270595679 100644
--- a/src/main/org/apache/tools/zip/ZipEncodingHelper.java
+++ b/src/main/org/apache/tools/zip/ZipEncodingHelper.java
@@ -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);
     }
 }