diff options
| author | mkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-10-16 17:58:01 +0000 |
|---|---|---|
| committer | mkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-10-16 17:58:01 +0000 |
| commit | e89f6ce7e95329a105fd4d66add89b396b1721d2 (patch) | |
| tree | 48b924a773efdc1bc9eb6a8a25ab747998634be5 /libjava | |
| parent | 308003519985b45b6059cd4b3180669f2476119b (diff) | |
| download | gcc-e89f6ce7e95329a105fd4d66add89b396b1721d2.tar.gz | |
2004-10-16 Michael Koch <konqueror@gmx.de>
* gnu/java/nio/charset/UTF_16Encoder.java
(UTF_16Encoder): Fixed maxBytesPerChar handling.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@89150 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/gnu/java/nio/charset/UTF_16Encoder.java | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index e41bf609f2a..03a108fcdff 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,10 @@ 2004-10-16 Michael Koch <konqueror@gmx.de> + * gnu/java/nio/charset/UTF_16Encoder.java + (UTF_16Encoder): Fixed maxBytesPerChar handling. + +2004-10-16 Michael Koch <konqueror@gmx.de> + * java/math/BigDecimal.java, java/math/BigInteger.java: Reorganized import statements, removed redundant and reorganized modifiers. diff --git a/libjava/gnu/java/nio/charset/UTF_16Encoder.java b/libjava/gnu/java/nio/charset/UTF_16Encoder.java index b0cb9ed8ce1..8026e027bec 100644 --- a/libjava/gnu/java/nio/charset/UTF_16Encoder.java +++ b/libjava/gnu/java/nio/charset/UTF_16Encoder.java @@ -63,7 +63,7 @@ final class UTF_16Encoder extends CharsetEncoder UTF_16Encoder (Charset cs, int byteOrder, boolean useByteOrderMark) { super (cs, 2.0f, - useByteOrderMark ? 4.0f : 2.0f, + useByteOrderMark ? 2.0f : 4.0f, byteOrder == BIG_ENDIAN ? new byte[] { (byte) 0xFF, (byte) 0xFD } : new byte[] { (byte) 0xFD, (byte) 0xFF }); |