harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ton...@apache.org
Subject svn commit: r893708 - in /harmony/enhanced/classlib/branches/java6/modules: luni/src/main/native/luni/windows/ nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/
Date Thu, 24 Dec 2009 08:37:28 GMT
Author: tonywu
Date: Thu Dec 24 08:37:27 2009
New Revision: 893708

URL: http://svn.apache.org/viewvc?rev=893708&view=rev
Log:
merge the patch for HARMONY-6408 to java 6 branch

Modified:
    harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/windows/charsetmap.h
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/GB2312.java
    harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/GBK.java

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/windows/charsetmap.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/windows/charsetmap.h?rev=893708&r1=893707&r2=893708&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/windows/charsetmap.h
(original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/windows/charsetmap.h
Thu Dec 24 08:37:27 2009
@@ -31,7 +31,7 @@
   863,"IBM863",       864,"IBM864",         865,"IBM865",
   866,"cp866",        869,"ibm869",         870,"IBM870",
   874,"windows-874",  875,"cp875",          932,"shift_jis",
-  936,"gb2312",       949,"ks_c_5601-1987", 950,"big5",
+  936,"GBK",          949,"ks_c_5601-1987", 950,"big5",
   1026,"IBM1026",     1047,"IBM01047",      1140,"IBM01140",
   1141,"IBM01141",    1142,"IBM01142",      1143,"IBM01143",
   1144,"IBM01144",    1145,"IBM01145",      1146,"IBM01146",

Modified: harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/GB2312.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/GB2312.java?rev=893708&r1=893707&r2=893708&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/GB2312.java
(original)
+++ harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/GB2312.java
Thu Dec 24 08:37:27 2009
@@ -295,6 +295,7 @@
                                 }else{
                                     if(c < 0x008E) {
                                         bb.put((byte)c);
+                                        bbRemaining--;
                                     } else {
                                         int index = (int)c >> 8;
                                         index = encodeIndex[index];

Modified: harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/GBK.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/GBK.java?rev=893708&r1=893707&r2=893708&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/GBK.java
(original)
+++ harmony/enhanced/classlib/branches/java6/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/GBK.java
Thu Dec 24 08:37:27 2009
@@ -339,6 +339,7 @@
                                 }else{
                                     if(c < 0x0080) {
                                         bb.put((byte)c);
+                                        bbRemaining--;
                                     } else {
                                         int index = (int)c >> 8;
                                         index = encodeIndex[index];



Mime
View raw message