# HG changeset patch # User Raimund Renkert # Date 1378379759 -7200 # Node ID e0bbb54f2f7c0fc6a2b75bdaf49280d38d89fefe # Parent 3f03e954c04d56a28a0cb395e37fe075c8856126 Added reset for errors and warnings in importer. diff -r 3f03e954c04d -r e0bbb54f2f7c src/main/java/de/intevation/lada/data/importer/Importer.java --- a/src/main/java/de/intevation/lada/data/importer/Importer.java Thu Sep 05 13:14:39 2013 +0200 +++ b/src/main/java/de/intevation/lada/data/importer/Importer.java Thu Sep 05 13:15:59 2013 +0200 @@ -11,4 +11,5 @@ public boolean importData(String content, AuthenticationResponse auth); public Map> getErrors(); public Map> getWarnings(); + public void reset(); } diff -r 3f03e954c04d -r e0bbb54f2f7c src/main/java/de/intevation/lada/data/importer/LAFImporter.java --- a/src/main/java/de/intevation/lada/data/importer/LAFImporter.java Thu Sep 05 13:14:39 2013 +0200 +++ b/src/main/java/de/intevation/lada/data/importer/LAFImporter.java Thu Sep 05 13:15:59 2013 +0200 @@ -121,4 +121,10 @@ this.errors.putAll(this.parser.getErrors()); return true; } + + public void reset() { + parser.reset(); + this.warnings = new HashMap>(); + this.errors = new HashMap>(); + } } diff -r 3f03e954c04d -r e0bbb54f2f7c src/main/java/de/intevation/lada/rest/LAFImportService.java --- a/src/main/java/de/intevation/lada/rest/LAFImportService.java Thu Sep 05 13:14:39 2013 +0200 +++ b/src/main/java/de/intevation/lada/rest/LAFImportService.java Thu Sep 05 13:15:59 2013 +0200 @@ -84,6 +84,7 @@ } } catch (IOException e) { + importer.reset(); return new Response(false, 603, null); } @@ -97,9 +98,11 @@ code = 670; } Response response = new Response(success, code, respData); + importer.reset(); return response; } catch(AuthenticationException ae) { + importer.reset(); return new Response(false, 699, null); } }