IO-453 - Regression in FileUtils.readFileToString from 2.0.1

sebbASF · sebbASF · commit baba8cc875f5 · 2014-07-30T23:18:55.000Z
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/io/trunk@1614791 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
@@ -47,6 +47,9 @@ The <action> type attribute can be add,update,fix,remove.
   <body>
     <!-- The release date is the date RC is cut -->
     <release version="2.5" date="2014-??-??" description="New features and bug fixes.">
+      <action issue="IO-453" dev="sebb" type="fix" due-to="Steven Christou">
+         Regression in FileUtils.readFileToString from 2.0.1
+      </action>
       <action issue="IO-451" dev="sebb" type="fix" due-to="David Standish">
          ant test fails - resources missing from test classpath
       </action>
diff --git a/src/main/java/org/apache/commons/io/FileUtils.java b/src/main/java/org/apache/commons/io/FileUtils.java
@@ -1799,7 +1799,7 @@ public static byte[] readFileToByteArray(final File file) throws IOException {
         InputStream in = null;
         try {
             in = openInputStream(file);
-            return IOUtils.toByteArray(in, file.length());
+            return IOUtils.toByteArray(in); // Do NOT use file.length() - see NET-453
         } finally {
             IOUtils.closeQuietly(in);
         }

Original file line number	Diff line number	Diff line change
`@@ -1799,7 +1799,7 @@ public static byte[] readFileToByteArray(final File file) throws IOException {`
`1799`	`1799`	`InputStream in = null;`
`1800`	`1800`	`try {`
`1801`	`1801`	`in = openInputStream(file);`
`1802`		`- return IOUtils.toByteArray(in, file.length());`
	`1802`	`+ return IOUtils.toByteArray(in); // Do NOT use file.length() - see NET-453`
`1803`	`1803`	`} finally {`
`1804`	`1804`	`IOUtils.closeQuietly(in);`
`1805`	`1805`	`}`