Return-Path: Delivered-To: apmail-harmony-commits-archive@www.apache.org Received: (qmail 23454 invoked from network); 12 Jul 2007 12:12:36 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 12 Jul 2007 12:12:36 -0000 Received: (qmail 93538 invoked by uid 500); 12 Jul 2007 12:12:38 -0000 Delivered-To: apmail-harmony-commits-archive@harmony.apache.org Received: (qmail 93524 invoked by uid 500); 12 Jul 2007 12:12:38 -0000 Mailing-List: contact commits-help@harmony.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@harmony.apache.org Delivered-To: mailing list commits@harmony.apache.org Received: (qmail 93515 invoked by uid 99); 12 Jul 2007 12:12:38 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 12 Jul 2007 05:12:38 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 12 Jul 2007 05:12:35 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 8D1901A981A; Thu, 12 Jul 2007 05:12:15 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r555607 - in /harmony/enhanced/classlib/trunk/modules/nio_char/src/main/java/org/apache/harmony/niochar: CharsetProviderImpl.java charset/additional/x_windows_949.java Date: Thu, 12 Jul 2007 12:12:15 -0000 To: commits@harmony.apache.org From: apetrenko@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070712121215.8D1901A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: apetrenko Date: Thu Jul 12 05:12:14 2007 New Revision: 555607 URL: http://svn.apache.org/viewvc?view=rev&rev=555607 Log: Patch for HARMONY-4393 "[classlib][nio charset] Charset KSC_5601 does not contains itself " Modified: harmony/enhanced/classlib/trunk/modules/nio_char/src/main/java/org/apache/harmony/niochar/CharsetProviderImpl.java harmony/enhanced/classlib/trunk/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/x_windows_949.java Modified: harmony/enhanced/classlib/trunk/modules/nio_char/src/main/java/org/apache/harmony/niochar/CharsetProviderImpl.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/nio_char/src/main/java/org/apache/harmony/niochar/CharsetProviderImpl.java?view=diff&rev=555607&r1=555606&r2=555607 ============================================================================== --- harmony/enhanced/classlib/trunk/modules/nio_char/src/main/java/org/apache/harmony/niochar/CharsetProviderImpl.java (original) +++ harmony/enhanced/classlib/trunk/modules/nio_char/src/main/java/org/apache/harmony/niochar/CharsetProviderImpl.java Thu Jul 12 05:12:14 2007 @@ -624,8 +624,7 @@ "x-MS950-HKSCS", "MS950_HKSCS" } }, - { "additional.x_windows_949", null, new String[] { "KSC_5601", - "x-windows-949", + { "additional.x_windows_949", null, new String[] { "x-windows-949", "MS949" } }, { "additional.GB18030", null, new String[] { "GB18030", Modified: harmony/enhanced/classlib/trunk/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/x_windows_949.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/x_windows_949.java?view=diff&rev=555607&r1=555606&r2=555607 ============================================================================== --- harmony/enhanced/classlib/trunk/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/x_windows_949.java (original) +++ harmony/enhanced/classlib/trunk/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/x_windows_949.java Thu Jul 12 05:12:14 2007 @@ -32,7 +32,7 @@ } public boolean contains(Charset cs) { - return cs.name().equalsIgnoreCase("IBM367") || cs.name().equalsIgnoreCase("US-ASCII") ; + return cs.name().equalsIgnoreCase("x-windows-949") || cs.name().equalsIgnoreCase("IBM367") || cs.name().equalsIgnoreCase("US-ASCII") ; } public CharsetDecoder newDecoder() {