merge-update from trunk

[taxeditor.git] / eu.etaxonomy.taxeditor.editor / src / main / java / eu / etaxonomy / taxeditor / editor / name / container / ContainerFactory.java

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/container/ContainerFactory.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/container/ContainerFactory.java
index 1634b7dcc860ac92238988c8800e382237447ca6..66c0f51479f97726ac7f9ef0dd306d7840557fca 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/container/ContainerFactory.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/container/ContainerFactory.java
@@ -8,7 +8,9 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
+import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 import eu.etaxonomy.cdm.model.name.HomotypicalGroup;
+import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationship;
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;
 import eu.etaxonomy.taxeditor.editor.name.TaxonNameEditor;
@@ -88,7 +90,8 @@ public class ContainerFactory {
        public static void createOrUpdateMisapplicationsGroup(
                        TaxonNameEditor taxonNameEditor) {
                MisappliedGroup group = taxonNameEditor.getMisappliedGroup();
-               if(taxonNameEditor.getTaxon().getMisappliedNames().isEmpty()){
+               Taxon taxon = HibernateProxyHelper.deproxy(taxonNameEditor.getTaxon(), Taxon.class);
+               if(taxon.getMisappliedNames().isEmpty()){
                        taxonNameEditor.removeGroup(group);             
                        taxonNameEditor.setMisapplicationsGroup(null);
                }else{