From 3951928e57d9a09c0006a4a5da7284a5255cc16a Mon Sep 17 00:00:00 2001
From: tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Tue, 30 Jan 2007 02:46:54 +0000
Subject: [PATCH] 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
---
 libjava/ChangeLog                                     |   6 ++++++
 .../lib/gnu/gcj/convert/BytesToCharsetAdaptor.class   | Bin 2167 -> 2162 bytes
 libjava/gnu/gcj/convert/BytesToCharsetAdaptor.java    |   4 ++--
 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 7efd0fe778bc436972e2e191d40437577069fe26..bf4e201c3fe51aaf3d81a317bb53ab4c3042bd07 100644
GIT binary patch
delta 180
zcwYN1@JV3992Rko%)Fe`y!4U`Mg~StE(RBdC?1ArhM37mS>$Cn85kMjco^atA{ZH1
zGxG}ai$Mw!c^HxyVm7~HNn_%?#lXVA%D}*oGdY&sh-Vu^WVqHA21g){oxFful`(em
zF?K~)GX`%4Ck9^zF9tt`NQOX$6oz01F`y<Bh*k!11_=fRFsp!}5NIWcRm2d%zyxL$
N16j-rUXyh=yaAUhBi;Z2

delta 211
zcwYM?@LgcT9F`!~%)Em9Vnzl=Pfi9#hA19}Xod(z29C_UoYcJZk_;{e7lv3KhB$_J
zMh4cL%-qZpMg|cLPfee!#Ii*Fyv%%kr_!{v)FNw;!bBd1B!>9S?^x29IPWvCFt9Q(
zFceOXWj7Mk+QJZ-u#F)m9LR74;?T*n*;N@sCm&>2bhT#iW^iZlW$<V41KJbFkjW6t
oAO_TF0@2SP&LF|S0A>{cF(a5&#1O&21ZEWjS<DRnlhrxA0WP>LJpcdz

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);
-- 
2.11.4.GIT