From: Cherian Mathew <c.mathew@bgbm.org>
Date: Wed, 30 Sep 2015 16:56:34 +0000 (+0200)
Subject: Add check for remoting to decide whether to merge or save
X-Git-Tag: 3.12.0^2~129^2~2
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/adb2a7261ee6160a922bd54d77ae4b8de9d59c26?ds=sidebyside

Add check for remoting to decide whether to merge or save
---

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonNodeWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonNodeWizard.java
index 4a300dc7a..a792ed4d3 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonNodeWizard.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonNodeWizard.java
@@ -53,7 +53,11 @@ public class NewTaxonNodeWizard extends AbstractNewEntityWizard<ITaxonTreeNode>{
             Taxon taxon = taxonNodePage.getTaxon();
             try{
                 TaxonNode taxonNode = parent.addChildTaxon(taxon, parent.getReference(), parent.getMicroReference());
-                taxonNode = CdmStore.getService(ITaxonNodeService.class).merge(taxonNode);
+                if(CdmStore.getCurrentSessionManager().isRemoting()) {
+                    taxonNode = CdmStore.getService(ITaxonNodeService.class).merge(taxonNode);
+                } else {
+                    taxonNode = CdmStore.getService(ITaxonNodeService.class).save(taxonNode);
+                }
                 generatedTaxonNodeUuid = taxonNode.getUuid();
                 Set<CdmBase> affectedObjects = new HashSet<CdmBase>();
                 //FIXME:Remoting Hack for now - need to generalise this