svn commit: r1505382 - /jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/JSON.java

[andy]

Author: andy
Date: Sun Jul 21 13:44:04 2013
New Revision: 1505382

URL: http://svn.apache.org/r1505382
Log:
Close stream after reading JSON.

Modified:
    jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/JSON.java

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/JSON.java
URL: 
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/JSON.java?rev=1505382&r1=1505381&r2=1505382&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/JSON.java 
(original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/JSON.java Sun 
Jul 21 13:44:04 2013
@@ -18,16 +18,10 @@
 
 package org.apache.jena.atlas.json;
 
-import java.io.FileNotFoundException ;
-import java.io.IOException ;
-import java.io.InputStream ;
-import java.io.OutputStream ;
-import java.io.Reader ;
-import java.io.StringReader ;
+import java.io.* ;
 
 import org.apache.jena.atlas.io.IO ;
 import org.apache.jena.atlas.io.IndentedWriter ;
-import org.apache.jena.atlas.io.PeekReader ;
 import org.apache.jena.atlas.json.io.JSONMaker ;
 import org.apache.jena.atlas.json.io.JsonWriter ;
 import org.apache.jena.atlas.json.io.parser.JSONParser ;
@@ -70,8 +64,7 @@ public class JSON
         try
         {
             InputStream in = IO.openFileEx(filename) ;
-            PeekReader r = PeekReader.makeUTF8(in) ;
-            return _parse(r) ;
+            try { return JSON.parse(in) ; } finally { in.close() ; }
         }
         catch (FileNotFoundException ex)
         {
@@ -79,7 +72,8 @@ public class JSON
         }
         catch (IOException ex)
         {
-            throw new RuntimeException("IOException: "+filename, ex) ;
+            IO.exception("IOException: "+filename, ex);
+            return null ;
         }
     }
     
@@ -89,8 +83,7 @@ public class JSON
         try
         {
             InputStream in = IO.openFileEx(filename) ;
-            PeekReader r = PeekReader.makeUTF8(in) ;
-            return _parseAny(r) ;
+            try { return JSON.parseAny(in) ; } finally { in.close() ; }
         }
         catch (FileNotFoundException ex)
         {
@@ -98,7 +91,8 @@ public class JSON
         }
         catch (IOException ex)
         {
-            throw new RuntimeException("IOException: "+filename, ex) ;
+            IO.exception("IOException: "+filename, ex);
+            return null ;
         }
 
     }