# HG changeset patch # User Ingo Weinzierl # Date 1324031155 0 # Node ID c6432e8ea31ea3ed9dba468c66c09e10a6c6a6eb # Parent f114c0d55d19229371f0400c7a7bb5cb7bfb6870 Bugfix: add new Outputs during merge process in AttributeWriter. flys-artifacts/trunk@3433 c6561f87-3c4e-4783-a992-168aeb5c3f6f diff -r f114c0d55d19 -r c6432e8ea31e flys-artifacts/ChangeLog --- 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 + + * 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 * src/main/java/de/intevation/flys/collections/AttributeWriter.java: diff -r f114c0d55d19 -r c6432e8ea31e flys-artifacts/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 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); }