IO-311 IOUtils.read(InputStream/Reader) ignores the offset parameter

sebbASF · sebbASF · commit f584ed909815 · 2012-03-22T21:13:00.000Z
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/io/trunk@1304066 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
@@ -40,6 +40,9 @@ The <action> type attribute can be add,update,fix,remove.
 
   <body>
     <release version="2.2" date="TBA" description="">
+      <action issue="IO-311" dev="sebb" type="fix" due-to="Robert Muir">
+        IOUtils.read(InputStream/Reader) ignores the offset parameter
+      </action>        
       <action issue="IO-312" dev="sebb" type="fix">
         CharSequenceInputStream(CharSequence s, Charset charset, int bufferSize) ignores bufferSize
       </action>        
diff --git a/src/main/java/org/apache/commons/io/IOUtils.java b/src/main/java/org/apache/commons/io/IOUtils.java
@@ -1977,7 +1977,7 @@ public static int read(Reader input, char[] buffer, int offset, int length) thro
         int remaining = length;
         while (remaining > 0) {
             int location = length - remaining;
-            int count = input.read(buffer, location, remaining);
+            int count = input.read(buffer, offset + location, remaining);
             if (EOF == count) { // EOF
                 break;
             }
@@ -2023,7 +2023,7 @@ public static int read(InputStream input, byte[] buffer, int offset, int length)
         int remaining = length;
         while (remaining > 0) {
             int location = length - remaining;
-            int count = input.read(buffer, location, remaining);
+            int count = input.read(buffer, offset + location, remaining);
             if (EOF == count) { // EOF
                 break;
             }
diff --git a/src/test/java/org/apache/commons/io/IOUtilsTestCase.java b/src/test/java/org/apache/commons/io/IOUtilsTestCase.java
@@ -30,6 +30,7 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
+import java.io.StringReader;
 import java.net.URI;
 import java.net.URL;
 import java.nio.channels.Selector;
@@ -732,6 +733,23 @@ public void testReadReader() throws Exception {
         }
         IOUtils.closeQuietly(input);
     }
+    
+    public void testReadReaderWithOffset() throws Exception {
+        Reader reader = new StringReader("abcd1234");
+        char[] buffer = "wx00000000".toCharArray();
+        IOUtils.readFully(reader, buffer, 2, 8);
+        assertEquals("wxabcd1234", new String(buffer));
+        IOUtils.closeQuietly(reader);
+    }
+    
+    public void testReadStreamWithOffset() throws Exception {
+        byte[] bytes = "abcd1234".getBytes("UTF-8");
+        ByteArrayInputStream stream = new ByteArrayInputStream(bytes);
+        byte[] buffer = "wx00000000".getBytes("UTF-8");
+        IOUtils.readFully(stream, buffer, 2, 8);
+        assertEquals("wxabcd1234", new String(buffer, 0, buffer.length, "UTF-8"));
+        IOUtils.closeQuietly(stream);
+    }
 
     // Tests from IO-305
     
