From d875880c421f72daf8dad9645eed3ff976f11a0b Mon Sep 17 00:00:00 2001
From: Cherian Mathew <c.mathew@bgbm.org>
Date: Tue, 13 Oct 2015 17:39:34 +0200
Subject: [PATCH] Fix setting of key statement

---
 .../java/eu/etaxonomy/taxeditor/remoting/cache/CacheLoader.java | 2 +-
 .../ui/section/key/PolytomousKeyNodeDetailElement.java          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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 62fc5c20a..79e4adc30 100644
--- 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 9bc9a078c..6981bc661 100644
--- 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) {
-- 
2.34.1