ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-06-12 20:28:18 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

add jdk-test target, and fix failures

Browse Source 
The intent of this target is to run our test suite against the installed jre.
This should help prevent our VM from diverging in implementation from the jdk.

The remainder of this commit fixes the problems that this exposes.
This commit is contained in:
Joshua Warner
2013-12-06 14:56:02 -07:00
parent 39e3850ed8
commit 47a7732a81
11 changed files with 44 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
classpath/java/util/jar/JarFile.java
View File

@ -50,7 +50,7 @@ public class JarFile extends ZipFile {
}
}
public int getCompressedSize() {
public long getCompressedSize() {
try {
return compressedSize(window, pointer);
} catch (IOException e) {
@ -58,7 +58,7 @@ public class JarFile extends ZipFile {
}
}
public int getSize() {
public long getSize() {
try {
return uncompressedSize(window, pointer);
} catch (IOException e) {

10
classpath/java/util/zip/ZipEntry.java
View File

@ -42,8 +42,8 @@ public class ZipEntry {
int modTimeDate = -1;
long millisTime = -1;
int crc = -1;
int compSize = 0;
int uncompSize = 0;
long compSize = 0;
long uncompSize = 0;
int offset = -1;
public ZipEntry(String name) {
@ -191,12 +191,12 @@ public class ZipEntry {
uncompSize = size;
}
public int getSize() {
public long getSize() {
return uncompSize;
}
//Methods to set and get the compressed size of the entry
public void setCompressedSize(int size){
public void setCompressedSize(long size){
if (size < 0){
return;
}
@ -204,7 +204,7 @@ public class ZipEntry {
compSize = size;
}
public int getCompressedSize() {
public long getCompressedSize() {
return compSize;
}
}

4
classpath/java/util/zip/ZipFile.java
View File

@ -298,7 +298,7 @@ public class ZipFile {
}
}
public int getCompressedSize() {
public long getCompressedSize() {
try {
return compressedSize(window, pointer);
} catch (IOException e) {
@ -306,7 +306,7 @@ public class ZipFile {
}
}
public int getSize() {
public long getSize() {
try {
return uncompressedSize(window, pointer);
} catch (IOException e) {

8
classpath/java/util/zip/ZipOutputStream.java
View File

@ -147,8 +147,8 @@ public class ZipOutputStream extends DeflaterOutputStream {
addFourBytes(DATA_DESCRIPTER_HEADER, 0, tmpBuffer); // data descripter header
addFourBytes(currentEntry.crc, 4, tmpBuffer); // crc value
addFourBytes(currentEntry.compSize, 8, tmpBuffer); // compressed size
addFourBytes(currentEntry.uncompSize, 12, tmpBuffer);// uncompressed size
addFourBytes((int)currentEntry.compSize, 8, tmpBuffer); // compressed size
addFourBytes((int)currentEntry.uncompSize, 12, tmpBuffer);// uncompressed size
out.write(tmpBuffer, 0, 16);
bytesWritten += 16;
}
@ -164,8 +164,8 @@ public class ZipOutputStream extends DeflaterOutputStream {
addFourBytes(e.modTimeDate, 12, tmpBuffer); // last mod date and time
addFourBytes(e.crc, 16, tmpBuffer); // crc
addFourBytes(e.compSize, 20, tmpBuffer); // compressed size
addFourBytes(e.uncompSize, 24, tmpBuffer); // uncompressed size
addFourBytes((int)e.compSize, 20, tmpBuffer); // compressed size
addFourBytes((int)e.uncompSize, 24, tmpBuffer); // uncompressed size
addTwoBytes(e.getName().length(), 28, tmpBuffer); // file name length