call input merge only once not for every container in TaxonNameEditor
authorKatja Luther <k.luther@bgbm.org>
Mon, 6 Nov 2017 12:04:54 +0000 (13:04 +0100)
committerKatja Luther <k.luther@bgbm.org>
Mon, 6 Nov 2017 12:05:29 +0000 (13:05 +0100)
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/TaxonNameEditorE4.java

index 8debbebd540cf79f91725de3c7db56eb32f6602f..440f484101ba008c697970eef8278905dcce4abd 100644 (file)
@@ -367,16 +367,17 @@ public class TaxonNameEditorE4 implements IConversationEnabled, IDirtyMarkable,
                if (monitor.isCanceled()) {
                    throw new OperationCanceledException();
                }
-               // commit the conversation and start a new transaction immediately
-               input.merge();
 
-               conversation.commit(true);
-
-               // Otherwise declare this step as done.
+            // Otherwise declare this step as done.
                monitor.worked(1);
 
-               dirty.setDirty(false);
            }
+           input.merge();
+           // commit the conversation and start a new transaction immediately
+        conversation.commit(true);
+
+
+        dirty.setDirty(false);
 
            // Stop the progress monitor.
            monitor.done();