Author: andy
Date: Mon Jul 21 10:04:47 2014
New Revision: 1612222
URL: http://svn.apache.org/r1612222
Log:
Fix failure to close file after reading whole contents
Modified:
jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/IO.java
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/IO.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/IO.java?rev=1612222&r1=1612221&r2=1612222&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/IO.java
(original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/IO.java Mon Jul
21 10:04:47 2014
@@ -262,8 +262,9 @@ public class IO
*/
public static String readWholeFileAsUTF8(String filename) throws
IOException {
- InputStream in = new FileInputStream(filename) ;
- return readWholeFileAsUTF8(in) ;
+ try ( InputStream in = new FileInputStream(filename) ) {
+ return readWholeFileAsUTF8(in) ;
+ }
}
/** Read a whole stream as UTF-8
@@ -275,8 +276,9 @@ public class IO
public static String readWholeFileAsUTF8(InputStream in) throws IOException
{
// Don't buffer - we're going to read in large chunks anyway
- Reader r = asUTF8(in) ;
- return readWholeFileAsUTF8(r) ;
+ try ( Reader r = asUTF8(in) ) {
+ return readWholeFileAsUTF8(r) ;
+ }
}
/** Read a whole file as UTF-8
