Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport 8253952 #593

Merged
merged 1 commit into from
Jul 21, 2022
Merged

Backport 8253952 #593

merged 1 commit into from
Jul 21, 2022

Conversation

r30shah
Copy link
Contributor

@r30shah r30shah commented Jul 21, 2022

Commit in this PR backports 8253952 which refines ZipOutputStream.putNextEntry() to recalculate ZipEntry's compressed size

Issue eclipse-openj9/openj9#14948

See also ibmruntimes/openj9-openjdk-jdk11#554

Signed-off-by: Rahil Shah rahil@ca.ibm.com

@pshipton
Copy link
Member

jenkins compile alinux64 jdk8

@pshipton
Copy link
Member

The testcase doesn't compile on jdk8. The implementation of jdk11 InputStream.transferTo() can be copied into the test case to fix it.

16:04:27  /home/jenkins/workspace/Grinder/aqa-tests/openjdk/openjdk-jdk/jdk/test/java/util/zip/CopyZipFile.java:121: error: cannot find symbol
16:04:27                  zis.transferTo(zos);
16:04:27                     ^
16:04:27    symbol:   method transferTo(ZipOutputStream)
16:04:27    location: variable zis of type ZipInputStream
16:04:27  /home/jenkins/workspace/Grinder/aqa-tests/openjdk/openjdk-jdk/jdk/test/java/util/zip/CopyZipFile.java:162: error: cannot find symbol
16:04:27                  is.transferTo(zos);
16:04:27                    ^
16:04:27    symbol:   method transferTo(ZipOutputStream)
16:04:27    location: variable is of type InputStream
16:04:27  /home/jenkins/workspace/Grinder/aqa-tests/openjdk/openjdk-jdk/jdk/test/java/util/zip/CopyZipFile.java:179: error: cannot find symbol
16:04:27                      is.transferTo(zos);
16:04:27                        ^
16:04:27    symbol:   method transferTo(ZipOutputStream)
16:04:27    location: variable is of type InputStream

@pshipton
Copy link
Member

Grinder on sanity.openjdk passed.
https://openj9-jenkins.osuosl.org/view/Test/job/Grinder/1172

@r30shah r30shah changed the title Backport 8253952 WIP: Backport 8253952 Jul 21, 2022
@r30shah r30shah force-pushed the backport8253952PR branch 3 times, most recently from d6e5bb2 to 3e0b024 Compare July 21, 2022 21:38
@r30shah r30shah changed the title WIP: Backport 8253952 Backport 8253952 Jul 21, 2022
@r30shah r30shah force-pushed the backport8253952PR branch 2 times, most recently from ceee154 to a1de37c Compare July 21, 2022 22:01
…e ZipEntry's compressed size

Signed-off-by: Rahil Shah <rahil@ca.ibm.com>
@pshipton pshipton merged commit 4cb47cd into ibmruntimes:openj9 Jul 21, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants