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 2017/09/13 20:35:15 UTC
svn commit: r1808283 -
/commons/proper/vfs/trunk/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/MonitorInputStream.java
Author: ggregory
Date: Wed Sep 13 20:35:15 2017
New Revision: 1808283
URL: http://svn.apache.org/viewvc?rev=1808283&view=rev
Log:
Refactor magic number into a constant.
Modified:
commons/proper/vfs/trunk/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/MonitorInputStream.java
Modified: commons/proper/vfs/trunk/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/MonitorInputStream.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/MonitorInputStream.java?rev=1808283&r1=1808282&r2=1808283&view=diff
==============================================================================
--- commons/proper/vfs/trunk/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/MonitorInputStream.java (original)
+++ commons/proper/vfs/trunk/commons-vfs2/src/main/java/org/apache/commons/vfs2/util/MonitorInputStream.java Wed Sep 13 20:35:15 2017
@@ -28,6 +28,7 @@ import java.util.concurrent.atomic.Atomi
public class MonitorInputStream
extends BufferedInputStream
{
+ private static final int EOF_CHAR = -1;
private final AtomicBoolean finished = new AtomicBoolean(false);
private final AtomicLong atomicCount = new AtomicLong(0);
@@ -64,11 +65,11 @@ public class MonitorInputStream
{
if (finished.get())
{
- return -1;
+ return EOF_CHAR;
}
final int ch = super.read();
- if (ch != -1)
+ if (ch != EOF_CHAR)
{
atomicCount.incrementAndGet();
return ch;
@@ -76,7 +77,7 @@ public class MonitorInputStream
// End-of-stream
close();
- return -1;
+ return EOF_CHAR;
}
/**
@@ -93,11 +94,11 @@ public class MonitorInputStream
{
if (finished.get())
{
- return -1;
+ return EOF_CHAR;
}
final int nread = super.read(buffer, offset, length);
- if (nread != -1)
+ if (nread != EOF_CHAR)
{
atomicCount.addAndGet(nread);
return nread;
@@ -105,7 +106,7 @@ public class MonitorInputStream
// End-of-stream
close();
- return -1;
+ return EOF_CHAR;
}
/**