+2007-03-12 Marco Trudel <mtrudel@gmx.ch>
+
+ * java/lang/natString.cc (getBytes (jstring enc)):
+ Fixed the loop for multiple cycles, Code cleanup
+
2007-03-09 Tom Tromey <tromey@redhat.com>
* sources.am, Makefile.in: Rebuilt.
// natString.cc - Implementation of java.lang.String native methods.
-/* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation
+/* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation
This file is part of libgcj.
while (todo > 0 || converter->havePendingBytes())
{
converter->setOutput(buffer, bufpos);
- // We only really need to do a single write.
- converter->setFinished();
int converted = converter->write(this, offset, todo, NULL);
bufpos = converter->count;
- if (converted == 0 && bufpos == converter->count)
+ if (converted == 0)
{
buflen *= 2;
jbyteArray newbuffer = JvNewByteArray(buflen);
buffer = newbuffer;
}
else
- bufpos = converter->count;
-
- offset += converted;
- todo -= converted;
+ {
+ offset += converted;
+ todo -= converted;
+ }
+ }
+ if (length() > 0)
+ {
+ converter->setFinished();
+ converter->write(this, 0, 0, NULL);
}
converter->done ();
if (bufpos == buflen)