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

natString.cc (init(jbyteArray,jint,jint,jstring)): Set count to 0 when InputStreamReader returns -1 for EOF. 

* java/lang/natString.cc (init(jbyteArray,jint,jint,jstring)):
	Set count to 0 when InputStreamReader returns -1 for EOF.

From-SVN: r26273
This commit is contained in:
Warren Levy 1999-04-07 19:31:01 +00:00 committed by Warren Levy
parent dc4618f922
commit 9a566c0926
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libjava/ChangeLog
View File

@ -1,3 +1,8 @@
1999-04-07 Warren Levy <warrenl@cygnus.com>
* java/lang/natString.cc (init(jbyteArray,jint,jint,jstring)):
Set count to 0 when InputStreamReader returns -1 for EOF.
1999-04-07 Tom Tromey <tromey@cygnus.com>
* mauve-libgcj: Omit java.text.Collator,

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

@ -392,6 +392,10 @@ java::lang::String::init (jbyteArray bytes, jint offset, jint count,
boffset = (char *) elements (array) - (char *) array;
// FIXME: this can throw IOException.
this->count = ir->read(array, 0, count);
// In case read() doesn't read anything, change -1 for EOF to a count of 0.
if (this->count < 0)
this->count = 0;
}
jboolean