Merge "Merge branch 'stable-5.5'"
This commit is contained in:
commit
c9a8d3d040
|
@ -1494,12 +1494,10 @@ private static class StringReader {
|
|||
}
|
||||
|
||||
int read() {
|
||||
try {
|
||||
return buf[pos++];
|
||||
} catch (ArrayIndexOutOfBoundsException e) {
|
||||
pos = buf.length;
|
||||
if (pos >= buf.length) {
|
||||
return -1;
|
||||
}
|
||||
return buf[pos++];
|
||||
}
|
||||
|
||||
void reset() {
|
||||
|
|
Loading…
Reference in New Issue