organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-21 04:29:31 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 1

ICU-8569 Commit r30176 UTF-7 update to ICU4J maint-4-8

Browse source 
X-SVN-Rev: 30177
This commit is contained in:
Michael Ow 2011-06-01 16:31:13 +00:00
parent 0da8a2fb9f
commit 22f305e3b3
3 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
main/classes/charset/src/com/ibm/icu/charset/CharsetUTF7.java
View file

@ -738,17 +738,16 @@ class CharsetUTF7 extends CharsetICU {
cr=CoderResult.OVERFLOW;
}
}
if (useIMAP) {
/* IMAP: need to terminate with a minus */
if (target.hasRemaining()) {
target.put(MINUS);
if (offsets!=null) {
offsets.put(sourceIndex - 1);
}
} else {
errorBuffer[errorBufferLength++]=MINUS;
cr=CoderResult.OVERFLOW;
/* need to terminate with a minus */
if (target.hasRemaining()) {
target.put(MINUS);
if (offsets!=null) {
offsets.put(sourceIndex - 1);
}
} else {
errorBuffer[errorBufferLength++]=MINUS;
cr=CoderResult.OVERFLOW;
}
}
/*reset the state for the next conversion */

4
main/shared/data/testdata.jar
View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e3758a1b8ac244b1f79cb0e6a6e0e8e096cc731e7be04e7574f44661c68f3751
size 718981
oid sha256:f9f02a9114fdca353732992ad3567a64efe8ea995ecb61bb0dc0d4fcf70731b3
size 719054

4
main/tests/charset/src/com/ibm/icu/dev/test/charset/TestCharset.java
View file

@ -3160,7 +3160,7 @@ public class TestCharset extends TestFmwk {
//test for overflow buffer error
ccus.put((char)0x2262);
ccbs.put((byte)0x2b); ccbs.put((byte)0x49); ccbs.put((byte)0x6d); ccbs.put((byte)0x49);
ccbs.put((byte)0x2b); ccbs.put((byte)0x49); ccbs.put((byte)0x6d); ccbs.put((byte)0x49); ccbs.put((byte)0x2d);
ccbs.limit(ccbs.position());
ccbs.position(0);
@ -3178,7 +3178,7 @@ public class TestCharset extends TestFmwk {
//test for overflow buffer error
encoder.reset();
ccus.put((char)0x3980); ccus.put((char)0x2715);
ccbs.put((byte)0x2b); ccbs.put((byte)0x4f); ccbs.put((byte)0x59);
ccbs.put((byte)0x2b); ccbs.put((byte)0x4f); ccbs.put((byte)0x59); ccbs.put((byte)0x2d);
ccbs.limit(ccbs.position());
ccbs.position(0);