AVRO-1715. Java: Close files opened by the Schema parser. Contributed…

… by Pavel Safrata.

This also clarifies the InputStream parse method, which does not own the
stream that is passed in and does not close it. The tools have been
updated to correctly close streams passed to the parser.

git-svn-id: https://svn.apache.org/repos/asf/avro/trunk@1707389 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -195,6 +195,9 @@ Avro 1.8.0 (10 August 2014)
     AVRO-1700. C++: Fix avro_BufferStreambuf_hh__ header guard.
     (Liu Yanbo via blue)
 
+    AVRO-1715. Java: Close files opened by the Schema parser.
+    (Pavel Safrata via blue)
+
 Avro 1.7.7 (23 July 2014)
 
   NEW FEATURES

lang/java/avro/src/main/java/org/apache/avro/Schema.java

@@ -997,9 +997,11 @@ public Schema parse(File file) throws IOException {
     }
 
     /** Parse a schema from the provided stream.
-     * If named, the schema is added to the names known to this parser. */
+     * If named, the schema is added to the names known to this parser.
+     * The input stream stays open after the parsing. */
     public Schema parse(InputStream in) throws IOException {
-      return parse(FACTORY.createJsonParser(in));
+      return parse(FACTORY.createJsonParser(in).disable(
+              JsonParser.Feature.AUTO_CLOSE_SOURCE));
     }
 
     /** Read a schema from one or more json strings */
@@ -1030,6 +1032,7 @@ private Schema parse(JsonParser parser) throws IOException {
       } catch (JsonParseException e) {
         throw new SchemaParseException(e);
       } finally {
+        parser.close();
         validateNames.set(saved);
         VALIDATE_DEFAULTS.set(savedValidateDefaults);
       }

lang/java/tools/src/main/java/org/apache/avro/tool/BinaryFragmentToJsonTool.java

@@ -66,7 +66,7 @@ public int run(InputStream stdin, PrintStream out, PrintStream err,
       schema = new Schema.Parser().parse(nargs.get(0));
       inputFile = nargs.get(1);
     } else {
-      schema = new Schema.Parser().parse(Util.openFromFS(schemaFile));
+      schema = Util.parseSchemaFromFS(schemaFile);
       inputFile = nargs.get(0);
     }
     InputStream input = Util.fileOrStdin(inputFile, stdin);

lang/java/tools/src/main/java/org/apache/avro/tool/CreateRandomFileTool.java

@@ -78,7 +78,7 @@ public int run(InputStream stdin, PrintStream out, PrintStream err,
         return 1;
     }
     Schema schema = (schemafile != null)
-        ? new Schema.Parser().parse(Util.openFromFS(schemafile))
+        ? Util.parseSchemaFromFS(schemafile)
         : new Schema.Parser().parse(schemastr);
 
     DataFileWriter<Object> writer =

lang/java/tools/src/main/java/org/apache/avro/tool/DataFileWriteTool.java

@@ -80,7 +80,7 @@ public int run(InputStream stdin, PrintStream out, PrintStream err,
         return 1;
     }
     Schema schema = (schemafile != null)
-        ? new Schema.Parser().parse(Util.openFromFS(schemafile))
+        ? Util.parseSchemaFromFS(schemafile)
         : new Schema.Parser().parse(schemastr);
 
     DatumReader<Object> reader = new GenericDatumReader<Object>(schema);

lang/java/tools/src/main/java/org/apache/avro/tool/JsonToBinaryFragmentTool.java

@@ -62,7 +62,7 @@ public int run(InputStream stdin, PrintStream out, PrintStream err,
       schema = new Schema.Parser().parse(nargs.get(0));
       inputFile = nargs.get(1);
     } else {
-      schema = new Schema.Parser().parse(Util.openFromFS(schemaFile));
+      schema = Util.parseSchemaFromFS(schemaFile);
       inputFile = nargs.get(0);
     }
     InputStream input = Util.fileOrStdin(inputFile, stdin);

lang/java/tools/src/main/java/org/apache/avro/tool/Util.java

@@ -153,6 +153,21 @@ static void close(OutputStream out) {
     }
   }
 
+  /**
+   * Parses a schema from the specified file.
+   * @param filename The file name to parse
+   * @return The parsed schema
+   * @throws IOException
+   */
+  static Schema parseSchemaFromFS(String filename) throws IOException {
+    InputStream stream = openFromFS(filename);
+    try {
+      return new Schema.Parser().parse(stream);
+    } finally {
+      close(stream);
+    }
+  }
+
   /**If pathname is a file, this method returns a list with a single absolute Path to that file,
    * if pathname is a directory, this method returns a list of Pathes to all the files within
    * this directory.