Author: sebb Date: Tue Oct 22 01:37:12 2013 New Revision: 1534455 URL: http://svn.apache.org/r1534455 Log: Don't reuse field name
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/bytesource/ByteSourceInputStream.java Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/bytesource/ByteSourceInputStream.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/bytesource/ByteSourceInputStream.java?rev=1534455&r1=1534454&r2=1534455&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/bytesource/ByteSourceInputStream.java (original) +++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/bytesource/ByteSourceInputStream.java Tue Oct 22 01:37:12 2013 @@ -216,13 +216,13 @@ public class ByteSourceInputStream exten + ", data length: " + streamLength + ")."); } - final InputStream is = getInputStream(); - skipBytes(is, blockStart); + final InputStream cis = getInputStream(); + skipBytes(cis, blockStart); final byte bytes[] = new byte[blockLength]; int total = 0; while (true) { - final int read = is.read(bytes, total, bytes.length - total); + final int read = cis.read(bytes, total, bytes.length - total); if (read < 1) { throw new IOException("Could not read block."); } @@ -241,10 +241,10 @@ public class ByteSourceInputStream exten return streamLength; } - final InputStream is = getInputStream(); + final InputStream cis = getInputStream(); long result = 0; long skipped; - while ((skipped = is.skip(1024)) > 0) { + while ((skipped = cis.skip(1024)) > 0) { result += skipped; } streamLength = result;