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

[niallp]

Author: niallp
Date: Wed Sep 29 00:41:43 2010
New Revision: 1002432

URL: http://svn.apache.org/viewvc?rev=1002432&view=rev
Log:
IO-197 Change size and position from int to long

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

Modified: 
commons/proper/io/trunk/src/java/org/apache/commons/io/input/BoundedInputStream.java
URL: 
http://svn.apache.org/viewvc/commons/proper/io/trunk/src/java/org/apache/commons/io/input/BoundedInputStream.java?rev=1002432&r1=1002431&r2=1002432&view=diff
==============================================================================
--- 
commons/proper/io/trunk/src/java/org/apache/commons/io/input/BoundedInputStream.java
 (original)
+++ 
commons/proper/io/trunk/src/java/org/apache/commons/io/input/BoundedInputStream.java
 Wed Sep 29 00:41:43 2010
@@ -38,13 +38,13 @@ public class BoundedInputStream extends 
     private final InputStream in;
 
     /** the max length to provide */
-    private final int max;
+    private final long max;
 
     /** the number of bytes already returned */
-    private int pos = 0;
+    private long pos = 0;
 
     /** the marked position */
-    private int mark = -1;
+    private long mark = -1;
 
     /** flag if close shoud be propagated */
     private boolean propagateClose = true;
@@ -59,7 +59,7 @@ public class BoundedInputStream extends 
     public BoundedInputStream(InputStream in, long size) {
         // Some badly designed methods - eg the servlet API - overload length
         // such that "-1" means stream finished
-        this.max = (int) size;
+        this.max = size;
         this.in = in;
     }
 
@@ -117,8 +117,8 @@ public class BoundedInputStream extends 
         if (max>=0 && pos>=max) {
             return -1;
         }
-        int maxRead = max>=0 ? Math.min(len, max-pos) : len;
-        int bytesRead = in.read(b, off, maxRead);
+        long maxRead = max>=0 ? Math.min(len, max-pos) : len;
+        int bytesRead = in.read(b, off, (int)maxRead);
 
         if (bytesRead==-1) {
             return -1;