Mercurial > dive4elements > river
changeset 1996:c6432e8ea31e
Bugfix: add new Outputs during merge process in AttributeWriter.
flys-artifacts/trunk@3433 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
|---|---|
| date | Fri, 16 Dec 2011 10:25:55 +0000 |
| parents | f114c0d55d19 |
| children | 210020108ca4 |
| files | flys-artifacts/ChangeLog flys-artifacts/src/main/java/de/intevation/flys/collections/AttributeWriter.java |
| diffstat | 2 files changed, 12 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog Fri Dec 16 10:08:39 2011 +0000 +++ b/flys-artifacts/ChangeLog Fri Dec 16 10:25:55 2011 +0000 @@ -1,3 +1,9 @@ +2011-12-16 Ingo Weinzierl <ingo@intevation.de> + + * src/main/java/de/intevation/flys/collections/AttributeWriter.java: Bugfix: + Add new Outputs to the current CollectionAttribute if no old one is + existing. + 2011-12-16 Sascha L. Teichmann <sascha.teichmann@intevation.de> * src/main/java/de/intevation/flys/collections/AttributeWriter.java:
--- a/flys-artifacts/src/main/java/de/intevation/flys/collections/AttributeWriter.java Fri Dec 16 10:08:39 2011 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/collections/AttributeWriter.java Fri Dec 16 10:25:55 2011 +0000 @@ -93,8 +93,13 @@ for (Map.Entry<String, Output> entry: newAttr.entrySet()) { String outName = entry.getKey(); Output a = entry.getValue(); + + Output exists = attribute.getOutput(outName); + if (exists == null) { + attribute.addOutput(outName, a); + } + attribute.clearFacets(outName); - writeOutput(a.getName(), newFacets, oldFacets); }