svn commit: r1586308 - /commons/proper/io/trunk/src/main/java/org/apache/commons/io/input/BoundedInputStream.java

[gg...@apache.org]

Author: ggregory
Date: Thu Apr 10 14:06:25 2014
New Revision: 1586308

URL: http://svn.apache.org/r1586308
Log:
Refactor magic number into constant.

Modified:
    commons/proper/io/trunk/src/main/java/org/apache/commons/io/input/BoundedInputStream.java

Modified: commons/proper/io/trunk/src/main/java/org/apache/commons/io/input/BoundedInputStream.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/main/java/org/apache/commons/io/input/BoundedInputStream.java?rev=1586308&r1=1586307&r2=1586308&view=diff
==============================================================================
--- commons/proper/io/trunk/src/main/java/org/apache/commons/io/input/BoundedInputStream.java (original)
+++ commons/proper/io/trunk/src/main/java/org/apache/commons/io/input/BoundedInputStream.java Thu Apr 10 14:06:25 2014
@@ -35,6 +35,8 @@ import java.io.InputStream;
  */
 public class BoundedInputStream extends InputStream {
 
+    private static final int EOF = -1;
+
     /** the wrapped input stream */
     private final InputStream in;
 
@@ -45,7 +47,7 @@ public class BoundedInputStream extends 
     private long pos = 0;
 
     /** the marked position */
-    private long mark = -1;
+    private long mark = EOF;
 
     /** flag if close shoud be propagated */
     private boolean propagateClose = true;
@@ -71,7 +73,7 @@ public class BoundedInputStream extends 
      * @param in The wrapped input stream
      */
     public BoundedInputStream(final InputStream in) {
-        this(in, -1);
+        this(in, EOF);
     }
 
     /**
@@ -84,7 +86,7 @@ public class BoundedInputStream extends 
     @Override
     public int read() throws IOException {
         if (max >= 0 && pos >= max) {
-            return -1;
+            return EOF;
         }
         final int result = in.read();
         pos++;
@@ -115,13 +117,13 @@ public class BoundedInputStream extends 
     @Override
     public int read(final byte[] b, final int off, final int len) throws IOException {
         if (max>=0 && pos>=max) {
-            return -1;
+            return EOF;
         }
         final long maxRead = max>=0 ? Math.min(len, max-pos) : len;
         final int bytesRead = in.read(b, off, (int)maxRead);
 
-        if (bytesRead==-1) {
-            return -1;
+        if (bytesRead==EOF) {
+            return EOF;
         }
 
         pos+=bytesRead;