OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

natString.cc (getBytes): Reverted earlier change and applied correct fix from Per Bothner. 

* java/lang/natString.cc (getBytes): Reverted earlier change and
	applied correct fix from Per Bothner.

From-SVN: r26579
This commit is contained in:
Tom Tromey 1999-04-21 13:50:39 +00:00 committed by Tom Tromey
parent 5423609c57
commit baa288f308
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libjava/ChangeLog
View File

@ -1,5 +1,8 @@
1999-04-21 Tom Tromey <tromey@cygnus.com>
* java/lang/natString.cc (getBytes): Reverted earlier change and
applied correct fix from Per Bothner.
* java/lang/String.java: Don't throw
UnsupportedEncodingException.

8
libjava/java/lang/natString.cc
View File

@ -473,9 +473,11 @@ java::lang::String::getBytes (jstring enc)
{
converter->setOutput(buffer, bufpos);
int converted = converter->write(this, offset, todo, NULL);
bufpos = converter->count;
if (converted == 0)
{
jbyteArray newbuffer = JvNewByteArray(2 * buflen);
buflen *= 2;
jbyteArray newbuffer = JvNewByteArray(buflen);
memcpy (elements (newbuffer), elements (buffer), bufpos);
buffer = newbuffer;
}
@ -487,8 +489,8 @@ java::lang::String::getBytes (jstring enc)
}
if (bufpos == buflen)
return buffer;
jbyteArray result = JvNewByteArray(buflen);
memcpy (elements (result), elements (buffer), buflen);
jbyteArray result = JvNewByteArray(bufpos);
memcpy (elements (result), elements (buffer), bufpos);
return result;
}