From: Katja Luther <k.luther@bgbm.org>
Date: Mon, 20 Apr 2015 08:40:16 +0000 (+0000)
Subject: ticket #4804
X-Git-Tag: 3.6.0~109
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/dc39d372883bf9da1d66248163a8a1999ede0d78?ds=sidebyside

ticket #4804
---

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/TaxonNameEditor.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/TaxonNameEditor.java
index 24ea70f11..b3cd23d0d 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/TaxonNameEditor.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/TaxonNameEditor.java
@@ -235,7 +235,8 @@ public class TaxonNameEditor extends EditorPart implements
 	 * </p>
 	 */
 	public void createOrUpdateNameComposites() {
-		this.taxon = (Taxon)CdmStore.getService(ITaxonService.class).load(this.getTaxon().getUuid());
+		//this.taxon = (Taxon)CdmStore.getService(ITaxonService.class).load(this.getTaxon().getUuid());
+		//this.taxon = HibernateProxyHelper.deproxy(this.taxon, Taxon.class);
 		ContainerFactory.createOrUpdateAcceptedTaxonsHomotypicGroup(this);
 		ContainerFactory.createOrUpdateHeterotypicSynonymyGroups(this);
 		ContainerFactory.createOrUpdateMisapplicationsGroup(this);
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/CreateSynonymInNewGroupOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/CreateSynonymInNewGroupOperation.java
index 6fca0efc6..2ef74bc5d 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/CreateSynonymInNewGroupOperation.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/CreateSynonymInNewGroupOperation.java
@@ -15,6 +15,7 @@ import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 
+import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 import eu.etaxonomy.cdm.model.name.HomotypicalGroup;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;
 import eu.etaxonomy.cdm.model.taxon.SynonymRelationship;
@@ -67,11 +68,11 @@ public class CreateSynonymInNewGroupOperation extends AbstractPostTaxonOperation
 		// Add name to new homotypic group
 		HomotypicalGroup.NewInstance().addTypifiedName(newSynonymName);
 		monitor.worked(20);
-
+		HibernateProxyHelper.deproxy(element);
 		// Create a new synonym for the taxon
 		newSynonymRelationship = element.addHeterotypicSynonymName(newSynonymName);
 		monitor.worked(40);
-
+		
 		return postExecute(newSynonymRelationship.getSynonym());
 	}