summaryrefslogtreecommitdiffstats
path: root/libjava
diff options
context:
space:
mode:
authortromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>2007-01-30 02:46:54 +0000
committertromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>2007-01-30 02:46:54 +0000
commit3951928e57d9a09c0006a4a5da7284a5255cc16a (patch)
treebe299b5c175f292d9142efb49196be1f1cce28c2 /libjava
parent6f005ddef3b33f77b785171e8bcc179c68c3a89c (diff)
downloadppe42-gcc-3951928e57d9a09c0006a4a5da7284a5255cc16a.tar.gz
ppe42-gcc-3951928e57d9a09c0006a4a5da7284a5255cc16a.zip
2007-01-29 Kaloian Doganov <kaloian@doganov.org>
PR libgcj/30600: * gnu/gcj/convert/BytesToCharsetAdaptor.java (read): Fix call to 'limit'. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@121329 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
-rw-r--r--libjava/ChangeLog6
-rw-r--r--libjava/classpath/lib/gnu/gcj/convert/BytesToCharsetAdaptor.classbin2167 -> 2162 bytes
-rw-r--r--libjava/gnu/gcj/convert/BytesToCharsetAdaptor.java4
3 files changed, 8 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 037b1bb650d..023e31ac88c 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2007-01-29 Kaloian Doganov <kaloian@doganov.org>
+
+ PR libgcj/30600:
+ * gnu/gcj/convert/BytesToCharsetAdaptor.java (read): Fix call to
+ 'limit'.
+
2007-01-29 Kyle Galloway <kgallowa@redhat.com>
* include/java-interp.h: Added _Jv_Frame class and its two
diff --git a/libjava/classpath/lib/gnu/gcj/convert/BytesToCharsetAdaptor.class b/libjava/classpath/lib/gnu/gcj/convert/BytesToCharsetAdaptor.class
index 7efd0fe778b..bf4e201c3fe 100644
--- a/libjava/classpath/lib/gnu/gcj/convert/BytesToCharsetAdaptor.class
+++ b/libjava/classpath/lib/gnu/gcj/convert/BytesToCharsetAdaptor.class
Binary files differ
diff --git a/libjava/gnu/gcj/convert/BytesToCharsetAdaptor.java b/libjava/gnu/gcj/convert/BytesToCharsetAdaptor.java
index 78ba848e118..4b43d7bee0c 100644
--- a/libjava/gnu/gcj/convert/BytesToCharsetAdaptor.java
+++ b/libjava/gnu/gcj/convert/BytesToCharsetAdaptor.java
@@ -1,4 +1,4 @@
-/* Copyright (C) 2005 Free Software Foundation
+/* Copyright (C) 2005, 2007 Free Software Foundation
This file is part of libgcj.
@@ -71,7 +71,7 @@ public class BytesToCharsetAdaptor extends BytesToUnicode
{
if (inBuf == null || ! inBuf.hasArray() || inBuf.array() != inbuffer)
inBuf = ByteBuffer.wrap(inbuffer);
- inBuf.limit(inpos + inlength);
+ inBuf.limit(inlength);
inBuf.position(inpos);
CharBuffer outBuf = CharBuffer.wrap(outbuffer, outpos, count);
OpenPOWER on IntegriCloud