Add remoting checks for merge, Move to merge call which returns updated transient...

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / newWizard / NewPrimerWizard.java

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewPrimerWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewPrimerWizard.java
index 1e31797d6e9ba9905dd5bbf588c17272fdf01928..de52e18d14f64ec84e2786057f8796a511366066 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewPrimerWizard.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewPrimerWizard.java
@@ -38,7 +38,11 @@ public class NewPrimerWizard  extends AbstractNewEntityWizard<Primer> {
     /** {@inheritDoc} */
     @Override
     protected void saveEntity() {
-        CdmStore.getService(IPrimerService.class).merge(getEntity());
+        if(CdmStore.getCurrentSessionManager().isRemoting()) {
+            CdmStore.getService(IPrimerService.class).merge(getEntity(),true);
+        } else {
+            CdmStore.getService(IPrimerService.class).save(getEntity());
+        }
     }
 
     /** {@inheritDoc} */