Merge branch 'release/3.12.0'

[taxeditor.git] / eu.etaxonomy.taxeditor.bulkeditor / src / main / java / eu / etaxonomy / taxeditor / bulkeditor / input / ReferenceEditorInput.java

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/ReferenceEditorInput.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/ReferenceEditorInput.java
index 32df06a57bba415052508f4c43776c4341b41e0f..8b8c11360c4442e1c160b9ed43ea630209e3b738 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/ReferenceEditorInput.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/ReferenceEditorInput.java
@@ -140,7 +140,7 @@ public class ReferenceEditorInput extends AbstractBulkEditorInput<Reference> {
        @Override
     public Reference save(Reference entity) {
            if(CdmStore.getCurrentSessionManager().isRemoting()) {
-               return CdmStore.getService(IReferenceService.class).merge(entity, true);
+               return CdmStore.getService(IReferenceService.class).merge(entity, true).getMergedEntity();
            } else {
                CdmStore.getService(IReferenceService.class).saveOrUpdate(entity);
                return entity;