Skip to content

Decorate GZIPInputStream with DigestInputStream, not the other way around. #94

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

Closed
drasmart wants to merge 1 commit into from
Closed

Decorate GZIPInputStream with DigestInputStream, not the other way around. #94

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ...ne.engines/src/main/java/fiftyone/pipeline/engines/services/DataUpdateServiceDefault.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -620,6 +620,10 @@ private AutoUpdateStatus downloadFile(
logger.debug("HTTP Status is OK");
// wrap input stream in a buffered stream
InputStream is = new BufferedInputStream(connection.getInputStream());
// decompress, if necessary
if (dataFile.getConfiguration().getDecompressContent()) {
is = new GZIPInputStream(is);
}
// if checking md5 wrap in a DigestStream
MessageDigest md = null;
if (dataFile.getConfiguration().getVerifyMd5()) {
Expand All @@ -635,10 +639,6 @@ private AutoUpdateStatus downloadFile(
}
is = new DigestInputStream(is, md);
}
// decompress, if necessary
if (dataFile.getConfiguration().getDecompressContent()) {
is = new GZIPInputStream(is);
}
// copy resulting stream to destination
if (Objects.nonNull(tempFile.getPath())) {
logger.debug("Copying download stream");
Expand Down
Loading