diff --git a/icu4j/main/classes/collate/src/com/ibm/icu/text/CollatorReader.java b/icu4j/main/classes/collate/src/com/ibm/icu/text/CollatorReader.java index 8ddfaf6c8a..b316c6cfb9 100644 --- a/icu4j/main/classes/collate/src/com/ibm/icu/text/CollatorReader.java +++ b/icu4j/main/classes/collate/src/com/ibm/icu/text/CollatorReader.java @@ -63,22 +63,13 @@ final class CollatorReader } static void initRBC(RuleBasedCollator rbc, ByteBuffer data) throws IOException { - // TODO - why? 4 extra bytes? padding in the swapper? - //final int MIN_BINARY_DATA_SIZE_ = (42 + 25) << 2; - final int MIN_BINARY_DATA_SIZE_ = 272; + final int MIN_BINARY_DATA_SIZE_ = (42 + 25) << 2; int dataLength = data.remaining(); // TODO: Change the rest of this class to use the ByteBuffer directly, rather than // a DataInputStream, except for passing an InputStream to ICUBinary.readHeader(). // Consider changing ICUBinary to also work with a ByteBuffer. CollatorReader reader = new CollatorReader(makeByteBufferInputStream(data), false); if (dataLength > MIN_BINARY_DATA_SIZE_) { -// for (int i = 0; i < dataLength; i++) { -// byte b = data.get(i); -// System.out.print("0x" + (((int) 0xff & b) < 0x0f ? "0" : "") + Integer.toHexString(0xff & b) + " "); -// if (i % 16 == 0) { -// System.out.println(); -// } -// } reader.readImp(rbc, null, null); } else { reader.readHeader(rbc); diff --git a/icu4j/main/shared/data/icudata.jar b/icu4j/main/shared/data/icudata.jar index 6ab4f3761a..cb3b394834 100755 --- a/icu4j/main/shared/data/icudata.jar +++ b/icu4j/main/shared/data/icudata.jar @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6b057decb57c000e23ba800b65c067eb8282bf5d5df9dbb06eb3f10a1553d8d3 -size 7305782 +oid sha256:78145b2d62f77c80e9622e36956c9c3173eaa48dec20741e294dffac91f0104b +size 7305628 diff --git a/icu4j/main/shared/data/testdata.jar b/icu4j/main/shared/data/testdata.jar index e448f7d4f7..d7c21898f4 100755 --- a/icu4j/main/shared/data/testdata.jar +++ b/icu4j/main/shared/data/testdata.jar @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:815ccb8b5da9a2e856b84a6f33228852426b622191fc3513c743924085dabc0c -size 720766 +oid sha256:981d0e76e0f0069a484d7bbc2fe888139251e93aaf38b1045dad6e1980267c1c +size 718369