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.

Sign up for GitHub

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

Jump to bottom

IZPACK-1497: Serialize actual size of packed file data instead of the size of the original file to enable compression #592

Merged
merged 1 commit into from Mar 19, 2017
Merged

IZPACK-1497: Serialize actual size of packed file data instead of the size of the original file to enable compression #592

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 8 additions & 1 deletion izpack-compiler/src/main/java/com/izforge/izpack/compiler/packager/impl/Packager.java
View file
Open in desktop
Expand Up @@ -242,7 +242,14 @@ protected void writePacks() throws IOException
}

long bytesWritten = FileUtils.copyFile(file, finalStream);
finalStream.flush();
try
{
finalStream.flush();
}
catch (IOException ignored)
{
// some compressor output streams don't explicitly support flushing
}
finalStream.close();
if (bytesWritten != packFile.length())
{
Expand Down
2 changes: 1 addition & 1 deletion izpack-installer/src/main/java/com/izforge/izpack/installer/unpacker/FileUnpacker.java
View file
Open in desktop
Expand Up @@ -125,7 +125,7 @@ protected long copy(PackFile file, InputStream in, File target) throws IOExcepti
OutputStream out = getTarget(file, target);
byte[] buffer = new byte[5120];
long bytesCopied = 0;
long bytesToCopy = (file.isBackReference() ? file.getLinkedPackFile().size() : file.size());
long bytesToCopy = (file.isBackReference() ? file.getLinkedPackFile().length() : file.length());
logger.fine("|- Copying to file system (size: " + bytesToCopy + " bytes)");
try
{
Expand Down