From: Kaloian Doganov <kaloian@doganov.org>
Date: Tue, 30 Jan 2007 02:46:54 +0000 (+0000)
Subject: re PR libgcj/30600 (gnu.gcj.convert.BytesToCharsetAdaptor calculates bad argument... 
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2828987879a62a861500d4b1d5649575a07e0b78;p=gcc.git

re PR libgcj/30600 (gnu.gcj.convert.BytesToCharsetAdaptor calculates bad argument for java.nio.Buffer.limit(int))

2007-01-29  Kaloian Doganov  <kaloian@doganov.org>

	PR libgcj/30600:
	* gnu/gcj/convert/BytesToCharsetAdaptor.java (read): Fix call to
	'limit'.

From-SVN: r121329
---

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
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 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);