AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-7057 bug fix: make it actually work when assertions are disabled, tested without -ea

Browse Source 
X-SVN-Rev: 35789
This commit is contained in:
Markus Scherer 2014-06-02 15:32:42 +00:00
parent 98772b58a6
commit e91fd1e88e
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
icu4j/main/classes/core/src/com/ibm/icu/impl/ICUBinary.java
View File

@ -218,13 +218,14 @@ public final class ICUBinary
try { try {
int avail = is.available(); int avail = is.available();
byte[] bytes = new byte[avail]; byte[] bytes = new byte[avail];
assert avail == is.read(bytes); int numRead = is.read(bytes);
assert numRead == avail;
while((avail = is.available()) != 0) { while((avail = is.available()) != 0) {
// TODO Java 6 replace new byte[] and arraycopy(): byte[] newBytes = Arrays.copyOf(bytes, bytes.length + avail); // TODO Java 6 replace new byte[] and arraycopy(): byte[] newBytes = Arrays.copyOf(bytes, bytes.length + avail);
byte[] newBytes = new byte[bytes.length + avail]; byte[] newBytes = new byte[bytes.length + avail];
System.arraycopy(bytes, 0, newBytes, 0, bytes.length); System.arraycopy(bytes, 0, newBytes, 0, bytes.length);
int numRead = is.read(newBytes, bytes.length, avail); numRead = is.read(newBytes, bytes.length, avail);
assert avail == numRead; assert numRead == avail;
bytes = newBytes; bytes = newBytes;
} }
return ByteBuffer.wrap(bytes); return ByteBuffer.wrap(bytes);