You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2022/02/14 14:21:01 UTC
[commons-compress] branch master updated: Clearer private instance variable name.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-compress.git
The following commit(s) were added to refs/heads/master by this push:
new 71b0f06 Clearer private instance variable name.
71b0f06 is described below
commit 71b0f06c95b9e7b5b3c15b2f67bdc3b196873f7b
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Feb 13 17:55:30 2022 -0500
Clearer private instance variable name.
---
.../archivers/zip/ZipArchiveInputStream.java | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java b/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java
index 2a2d0b3..1e73c8f 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java
@@ -369,11 +369,11 @@ public class ZipArchiveInputStream extends ArchiveInputStream implements InputSt
final InputStream bis = new BoundedInputStream(inputStream, current.entry.getCompressedSize());
switch (m) {
case UNSHRINKING:
- current.in = new UnshrinkingInputStream(bis);
+ current.inputStream = new UnshrinkingInputStream(bis);
break;
case IMPLODING:
try {
- current.in = new ExplodingInputStream(
+ current.inputStream = new ExplodingInputStream(
current.entry.getGeneralPurposeBit().getSlidingDictionarySize(),
current.entry.getGeneralPurposeBit().getNumberOfShannonFanoTrees(),
bis);
@@ -382,10 +382,10 @@ public class ZipArchiveInputStream extends ArchiveInputStream implements InputSt
}
break;
case BZIP2:
- current.in = new BZip2CompressorInputStream(bis);
+ current.inputStream = new BZip2CompressorInputStream(bis);
break;
case ENHANCED_DEFLATED:
- current.in = new Deflate64CompressorInputStream(bis);
+ current.inputStream = new Deflate64CompressorInputStream(bis);
break;
default:
// we should never get here as all supported methods have been covered
@@ -395,7 +395,7 @@ public class ZipArchiveInputStream extends ArchiveInputStream implements InputSt
}
}
} else if (m == ZipMethod.ENHANCED_DEFLATED) {
- current.in = new Deflate64CompressorInputStream(inputStream);
+ current.inputStream = new Deflate64CompressorInputStream(inputStream);
}
entriesRead++;
@@ -529,7 +529,7 @@ public class ZipArchiveInputStream extends ArchiveInputStream implements InputSt
|| current.entry.getMethod() == ZipMethod.IMPLODING.getCode()
|| current.entry.getMethod() == ZipMethod.ENHANCED_DEFLATED.getCode()
|| current.entry.getMethod() == ZipMethod.BZIP2.getCode()) {
- read = current.in.read(buffer, offset, length);
+ read = current.inputStream.read(buffer, offset, length);
} else {
throw new UnsupportedZipFeatureException(ZipMethod.getMethodByCode(current.entry.getMethod()),
current.entry);
@@ -555,16 +555,16 @@ public class ZipArchiveInputStream extends ArchiveInputStream implements InputSt
return getBytesInflated();
}
if (current.entry.getMethod() == ZipMethod.UNSHRINKING.getCode()) {
- return ((UnshrinkingInputStream) current.in).getCompressedCount();
+ return ((UnshrinkingInputStream) current.inputStream).getCompressedCount();
}
if (current.entry.getMethod() == ZipMethod.IMPLODING.getCode()) {
- return ((ExplodingInputStream) current.in).getCompressedCount();
+ return ((ExplodingInputStream) current.inputStream).getCompressedCount();
}
if (current.entry.getMethod() == ZipMethod.ENHANCED_DEFLATED.getCode()) {
- return ((Deflate64CompressorInputStream) current.in).getCompressedCount();
+ return ((Deflate64CompressorInputStream) current.inputStream).getCompressedCount();
}
if (current.entry.getMethod() == ZipMethod.BZIP2.getCode()) {
- return ((BZip2CompressorInputStream) current.in).getCompressedCount();
+ return ((BZip2CompressorInputStream) current.inputStream).getCompressedCount();
}
return -1;
}
@@ -1319,7 +1319,7 @@ public class ZipArchiveInputStream extends ArchiveInputStream implements InputSt
/**
* The input stream decompressing the data for shrunk and imploded entries.
*/
- private InputStream in;
+ private InputStream inputStream;
}
/**