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-vfs.git
The following commit(s) were added to refs/heads/master by this push:
new 012ab9a Consistent local names.
012ab9a is described below
commit 012ab9acd70abd4924ca2b4da10df3ecd53985dd
Author: Gary Gregory <[email protected]>
AuthorDate: Mon Aug 19 14:40:56 2019 -0700
Consistent local names.
---
.../org/apache/commons/vfs2/provider/bzip2/Bzip2FileObject.java | 4 ++--
.../java/org/apache/commons/vfs2/provider/ftp/FtpFileObject.java | 6 +++---
.../java/org/apache/commons/vfs2/provider/gzip/GzipFileObject.java | 4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/bzip2/Bzip2FileObject.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/bzip2/Bzip2FileObject.java
index 5592e47..3f81bac 100644
---
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/bzip2/Bzip2FileObject.java
+++
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/bzip2/Bzip2FileObject.java
@@ -58,8 +58,8 @@ public class Bzip2FileObject extends
CompressedFileFileObject<Bzip2FileSystem> {
return wrapInputStream(getName().getURI(), is);
}
- public static InputStream wrapInputStream(final String name, final
InputStream is) throws IOException {
- return new BZip2CompressorInputStream(is);
+ public static InputStream wrapInputStream(final String name, final
InputStream inputStream) throws IOException {
+ return new BZip2CompressorInputStream(inputStream);
}
@Override
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpFileObject.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpFileObject.java
index b75ad43..6c783a7 100644
---
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpFileObject.java
+++
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpFileObject.java
@@ -485,12 +485,12 @@ public class FtpFileObject extends
AbstractFileObject<FtpFileSystem> {
protected InputStream doGetInputStream(final int bufferSize) throws
Exception {
final FtpClient client = getAbstractFileSystem().getClient();
try {
- final InputStream instr = client.retrieveFileStream(relPath, 0);
+ final InputStream inputStream = client.retrieveFileStream(relPath,
0);
// VFS-210
- if (instr == null) {
+ if (inputStream == null) {
throw new FileNotFoundException(getName().toString());
}
- return new FtpInputStream(client, instr, bufferSize);
+ return new FtpInputStream(client, inputStream, bufferSize);
} catch (final Exception e) {
getAbstractFileSystem().putClient(client);
throw e;
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/gzip/GzipFileObject.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/gzip/GzipFileObject.java
index 7706ba1..a9ce2ff 100644
---
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/gzip/GzipFileObject.java
+++
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/gzip/GzipFileObject.java
@@ -52,8 +52,8 @@ public class GzipFileObject extends
CompressedFileFileObject<GzipFileSystem> {
@Override
protected InputStream doGetInputStream(final int bufferSize) throws
Exception {
- final InputStream is = getContainer().getContent().getInputStream();
- return new GZIPInputStream(is, bufferSize);
+ final InputStream inputStream =
getContainer().getContent().getInputStream();
+ return new GZIPInputStream(inputStream, bufferSize);
}
@Override