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

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 037b1bb..023e31a 100644 (file)
--- 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
 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 7efd0fe..bf4e201 100644 (file)
Binary files a/libjava/classpath/lib/gnu/gcj/convert/BytesToCharsetAdaptor.class and b/libjava/classpath/lib/gnu/gcj/convert/BytesToCharsetAdaptor.class differ

diff --git a/libjava/gnu/gcj/convert/BytesToCharsetAdaptor.java b/libjava/gnu/gcj/convert/BytesToCharsetAdaptor.java
index 78ba848..4b43d7b 100644 (file)
--- 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.
 
 
 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);
   {
     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);
     inBuf.position(inpos);
 
     CharBuffer outBuf = CharBuffer.wrap(outbuffer, outpos, count);