summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Wielaard <mark@klomp.org>2005-02-16 23:22:06 +0000
committerMark Wielaard <mark@klomp.org>2005-02-16 23:22:06 +0000
commit4122b1bb312879f2394a1dddbc6c827d4004dd5e (patch)
tree38c917ff6d23191e990da9b2d4e0b61671354c57
parent323d753ebacfe1dcb8458b05fb1ed567bd1a02eb (diff)
downloadclasspath-4122b1bb312879f2394a1dddbc6c827d4004dd5e.tar.gz
2005-02-16 Julian Scheid <julian@sektor37.de>
* gnu/java/nio/charset/UTF_8.java (decodeLoop): Set inPos to in.position(). (encodeLoop): Likewise.
-rw-r--r--ChangeLog10
-rw-r--r--gnu/java/nio/charset/UTF_8.java4
2 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index c75245d3b..21945ad39 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-02-16 Julian Scheid <julian@sektor37.de>
+
+ * gnu/java/nio/charset/UTF_8.java (decodeLoop): Set inPos to
+ in.position().
+ (encodeLoop): Likewise.
+
2005-02-16 Andrew John Hughes <gnu_andrew@member.fsf.org>
* java/util/Locale.java
@@ -7,8 +13,8 @@
(getLocale(String, String, String)): Documentation.
(getISOCountries()): Now calls getISOStrings() and caches result.
(getISOLanguages()): Now calls getISOStrings() and caches result.
- (getISOStrings(String)): Pulls all two-letter keys from the specified hashtable
- in our locale information.
+ (getISOStrings(String)): Pulls all two-letter keys from the specified
+ hashtable in our locale information.
2005-02-16 Sven de Marothy <sven@physto.se>
diff --git a/gnu/java/nio/charset/UTF_8.java b/gnu/java/nio/charset/UTF_8.java
index c27143639..87df64423 100644
--- a/gnu/java/nio/charset/UTF_8.java
+++ b/gnu/java/nio/charset/UTF_8.java
@@ -101,7 +101,7 @@ final class UTF_8 extends Charset
protected CoderResult decodeLoop (ByteBuffer in, CharBuffer out)
{
// TODO: Optimize this in the case in.hasArray() / out.hasArray()
- int inPos = 0;
+ int inPos = in.position();
try
{
while (in.hasRemaining ())
@@ -196,7 +196,7 @@ final class UTF_8 extends Charset
protected CoderResult encodeLoop (CharBuffer in, ByteBuffer out)
{
- int inPos = 0;
+ int inPos = in.position();
try
{
// TODO: Optimize this in the case in.hasArray() / out.hasArray()