Less cryptic names.
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/http4/Http4RandomAccessContent.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/http4/Http4RandomAccessContent.java
index 912d450..ce4305a 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/http4/Http4RandomAccessContent.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/http4/Http4RandomAccessContent.java
@@ -37,8 +37,8 @@
private final Http4FileObject<FS> fileObject;
- private DataInputStream dis;
- private MonitorInputStream mis;
+ private DataInputStream dataInputStream;
+ private MonitorInputStream monitorInputStream;
Http4RandomAccessContent(final Http4FileObject<FS> fileObject, final RandomAccessMode mode) {
super(mode);
@@ -47,17 +47,17 @@
@Override
public void close() throws IOException {
- if (dis != null) {
- dis.close();
- dis = null;
- mis = null;
+ if (dataInputStream != null) {
+ dataInputStream.close();
+ dataInputStream = null;
+ monitorInputStream = null;
}
}
@Override
protected DataInputStream getDataInputStream() throws IOException {
- if (dis != null) {
- return dis;
+ if (dataInputStream != null) {
+ return dataInputStream;
}
final HttpGet httpGet = new HttpGet(fileObject.getInternalURI());
@@ -70,18 +70,18 @@
Long.valueOf(filePointer), Integer.valueOf(status));
}
- mis = new MonitoredHttpResponseContentInputStream(httpResponse);
+ monitorInputStream = new MonitoredHttpResponseContentInputStream(httpResponse);
// If the range request was ignored
if (status == HttpURLConnection.HTTP_OK) {
- final long skipped = mis.skip(filePointer);
+ final long skipped = monitorInputStream.skip(filePointer);
if (skipped != filePointer) {
throw new FileSystemException("vfs.provider.http/get-range.error", fileObject.getName(),
Long.valueOf(filePointer), Integer.valueOf(status));
}
}
- dis = new DataInputStream(new FilterInputStream(mis) {
+ dataInputStream = new DataInputStream(new FilterInputStream(monitorInputStream) {
@Override
public int read() throws IOException {
final int ret = super.read();
@@ -110,7 +110,7 @@
}
});
- return dis;
+ return dataInputStream;
}
@Override
@@ -134,7 +134,7 @@
throw new FileSystemException("vfs.provider/random-access-invalid-position.error", Long.valueOf(pos));
}
- if (dis != null) {
+ if (dataInputStream != null) {
close();
}
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/http5/Http5RandomAccessContent.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/http5/Http5RandomAccessContent.java
index ec8e345..0f9d621 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/http5/Http5RandomAccessContent.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/http5/Http5RandomAccessContent.java
@@ -37,8 +37,8 @@
private final Http5FileObject<FS> fileObject;
- private DataInputStream dis;
- private MonitorInputStream mis;
+ private DataInputStream dataInputStream;
+ private MonitorInputStream monitorInputStream;
Http5RandomAccessContent(final Http5FileObject<FS> fileObject, final RandomAccessMode mode) {
super(mode);
@@ -47,17 +47,17 @@
@Override
public void close() throws IOException {
- if (dis != null) {
- dis.close();
- dis = null;
- mis = null;
+ if (dataInputStream != null) {
+ dataInputStream.close();
+ dataInputStream = null;
+ monitorInputStream = null;
}
}
@Override
protected DataInputStream getDataInputStream() throws IOException {
- if (dis != null) {
- return dis;
+ if (dataInputStream != null) {
+ return dataInputStream;
}
final HttpGet httpGet = new HttpGet(fileObject.getInternalURI());
@@ -70,18 +70,18 @@
Long.valueOf(filePointer), Integer.valueOf(status));
}
- mis = new MonitoredHttpResponseContentInputStream(httpResponse);
+ monitorInputStream = new MonitoredHttpResponseContentInputStream(httpResponse);
// If the range request was ignored
if (status == HttpURLConnection.HTTP_OK) {
- final long skipped = mis.skip(filePointer);
+ final long skipped = monitorInputStream.skip(filePointer);
if (skipped != filePointer) {
throw new FileSystemException("vfs.provider.http/get-range.error", fileObject.getName(),
Long.valueOf(filePointer), Integer.valueOf(status));
}
}
- dis = new DataInputStream(new FilterInputStream(mis) {
+ dataInputStream = new DataInputStream(new FilterInputStream(monitorInputStream) {
@Override
public int read() throws IOException {
final int ret = super.read();
@@ -110,7 +110,7 @@
}
});
- return dis;
+ return dataInputStream;
}
@Override
@@ -134,7 +134,7 @@
throw new FileSystemException("vfs.provider/random-access-invalid-position.error", Long.valueOf(pos));
}
- if (dis != null) {
+ if (dataInputStream != null) {
close();
}
