Changeset 28361 in osm for applications/editors/josm/plugins/opendata

Timestamp:

2012-04-29T15:38:56+02:00 (12 years ago)

Author:

donvip

Message:

see #josm7641 - Close file handle after XSD validation

File:

• applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/NeptuneReader.java (modified) (2 diffs)

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/NeptuneReader.java

@@ -17 +17 @@
 
 import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
@@ -107 +109 @@
                 }
                 
-                Source xmlFile = new StreamSource(file);
-                
                 try {
-                        SchemaFactory schemaFactory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
-                        Schema schema = schemaFactory.newSchema(schemaURL);
-                        Validator validator = schema.newValidator();
-                        validator.validate(xmlFile);
-                        System.out.println(xmlFile.getSystemId() + " is valid");
-                        return true;
-                } catch (SAXException e) {
-                        System.out.println(xmlFile.getSystemId() + " is NOT valid");
-                        System.out.println("Reason: " + e.getLocalizedMessage());
-                } catch (IOException e) {
-                        System.out.println(xmlFile.getSystemId() + " is NOT valid");
-                        System.out.println("Reason: " + e.getLocalizedMessage());
+                        FileInputStream in = new FileInputStream(file);
+                        Source xmlFile = new StreamSource(in);
+                        try {
+                                SchemaFactory schemaFactory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
+                                Schema schema = schemaFactory.newSchema(schemaURL);
+                                Validator validator = schema.newValidator();
+                                validator.validate(xmlFile);
+                                System.out.println(xmlFile.getSystemId() + " is valid");
+                                return true;
+                        } catch (SAXException e) {
+                                System.out.println(xmlFile.getSystemId() + " is NOT valid");
+                                System.out.println("Reason: " + e.getLocalizedMessage());
+                        } catch (IOException e) {
+                                System.out.println(xmlFile.getSystemId() + " is NOT valid");
+                                System.out.println("Reason: " + e.getLocalizedMessage());
+                        } finally {
+                                try {
+                                        in.close();
+                                } catch (IOException e) {
+                                        // Ignore exception 
+                                }
+                        }
+                } catch (FileNotFoundException e) {
+                        System.err.println(e.getMessage());
                 }