Fix setting of key statement

diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/cache/CacheLoader.java b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/cache/CacheLoader.java
index 62fc5c20ae36ae79eed8f3ddcc89e9f6643ea702..79e4adc30c2595397a0fb07f3f723bde63a9126a 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/cache/CacheLoader.java
+++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/cache/CacheLoader.java
@@ -205,7 +205,7 @@ public class CacheLoader {
     public MergeResult<CdmBase> load(MergeResult<CdmBase> mergeResult, boolean recursive, boolean update) {
         CdmBase cdmBase = load(mergeResult.getMergedEntity(), recursive, update);
         load(mergeResult.getNewEntities(), recursive, update);
-        return mergeResult;
+        return new MergeResult(cdmBase, mergeResult.getNewEntities());
     }
 
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/key/PolytomousKeyNodeDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/key/PolytomousKeyNodeDetailElement.java
index 9bc9a078c570bafa95cb4db4029dd0f06f84acf7..6981bc6617d6a0abdd90340f6582446c194f74d9 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/key/PolytomousKeyNodeDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/key/PolytomousKeyNodeDetailElement.java
@@ -107,7 +107,7 @@ public class PolytomousKeyNodeDetailElement extends
                if (eventSource == element_question) {
                        getEntity().getParent().setQuestion(element_question.updateKeyStatement(getEntity().getQuestion()));
                } else if (eventSource == element_statement) {
-                   getEntity().getParent().setStatement(element_statement.updateKeyStatement(getEntity().getStatement()));
+                   getEntity().setStatement(element_statement.updateKeyStatement(getEntity().getStatement()));
                } else if (eventSource == selection_feature) {
                        getEntity().getParent().setFeature(selection_feature.getEntity());
                } else if (eventSource == selection_taxon) {