You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by re...@apache.org on 2009/12/23 03:28:04 UTC
svn commit: r893377 - in /harmony/enhanced/classlib/trunk/modules:
luni/src/main/native/luni/windows/
nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/
Author: regisxu
Date: Wed Dec 23 02:28:03 2009
New Revision: 893377
URL: http://svn.apache.org/viewvc?rev=893377&view=rev
Log:
Apply patch for HARMONY-6408: [classlib][luni]OutputStreamWriterTest got java.nio.BufferOverflowException
Modified:
harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/windows/charsetmap.h
harmony/enhanced/classlib/trunk/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/GB2312.java
harmony/enhanced/classlib/trunk/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/GBK.java
Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/windows/charsetmap.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/windows/charsetmap.h?rev=893377&r1=893376&r2=893377&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/windows/charsetmap.h (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/windows/charsetmap.h Wed Dec 23 02:28:03 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/trunk/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/GB2312.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/GB2312.java?rev=893377&r1=893376&r2=893377&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/GB2312.java (original)
+++ harmony/enhanced/classlib/trunk/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/GB2312.java Wed Dec 23 02:28:03 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/trunk/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/GBK.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/GBK.java?rev=893377&r1=893376&r2=893377&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/GBK.java (original)
+++ harmony/enhanced/classlib/trunk/modules/nio_char/src/main/java/org/apache/harmony/niochar/charset/additional/GBK.java Wed Dec 23 02:28:03 2009
@@ -339,6 +339,7 @@
}else{
if(c < 0x0080) {
bb.put((byte)c);
+ bbRemaining--;
} else {
int index = (int)c >> 8;
index = encodeIndex[index];