Mercurial > dive4elements > river
diff backend/src/main/java/org/dive4elements/river/importer/parsers/StaFileParser.java @ 7447:82b8bfb47260
Importer and doc: Warn instead of die if AT- or STA-file is missing for a gauge.
author | Tom Gottfried <tom@intevation.de> |
---|---|
date | Fri, 25 Oct 2013 16:57:15 +0200 |
parents | b58a71a5720c |
children | 0a5239a1e46e |
line wrap: on
line diff
--- a/backend/src/main/java/org/dive4elements/river/importer/parsers/StaFileParser.java Fri Oct 25 14:32:11 2013 +0200 +++ b/backend/src/main/java/org/dive4elements/river/importer/parsers/StaFileParser.java Fri Oct 25 16:57:15 2013 +0200 @@ -10,6 +10,7 @@ import java.io.File; import java.io.IOException; +import java.io.FileNotFoundException; import java.io.LineNumberReader; import java.io.FileInputStream; import java.io.InputStreamReader; @@ -51,12 +52,13 @@ File file = gauge.getStaFile(); log.info("parsing STA file: " + file); - LineNumberReader in = - new LineNumberReader( - new InputStreamReader( - new FileInputStream(file), ENCODING)); + LineNumberReader in = null; try { + in = new LineNumberReader( + new InputStreamReader( + new FileInputStream(file), ENCODING)); + String line = in.readLine(); if (line == null) { @@ -186,8 +188,14 @@ gauge.setNamedMainValues(namedMainValues); gauge.setMainValues(mainValues); } + catch (FileNotFoundException fnfe) { + log.error(fnfe.getMessage()); + return false; + } finally { - in.close(); + if (in != null) { + in.close(); + } } log.info("finished parsing STA file: " + file); return true;