Bugfixes merged into trunk

[taxeditor.git] / taxeditor-store / src / main / java / eu / etaxonomy / taxeditor / operations / ChangeConceptToSynonymOperation.java

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/ChangeConceptToSynonymOperation.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/ChangeConceptToSynonymOperation.java
index 78e0396c7f696116cb412bd2ccf389d35e99f150..ee0a52b34069b16433d41278bc9feef3f930e49a 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/ChangeConceptToSynonymOperation.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/ChangeConceptToSynonymOperation.java
@@ -63,7 +63,7 @@ public class ChangeConceptToSynonymOperation extends
                this.oldRelationshipType = taxonRelationship.getType();\r
                \r
                this.concept = concept;\r
-               this.homotypicalGroup = homotypicalGroup;\r
+               this.homotypicalGroup = homotypicalGroup != null ? homotypicalGroup : HomotypicalGroup.NewInstance();\r
        }\r
 \r
        /* (non-Javadoc)\r
@@ -81,7 +81,7 @@ public class ChangeConceptToSynonymOperation extends
                monitor.worked(20);\r
         \r
                // Add name to new homotypic group\r
-               HomotypicalGroup.NewInstance().addTypifiedName(synonymName);\r
+               homotypicalGroup.addTypifiedName(synonymName);\r
                monitor.worked(40);\r
                \r
         // Create a new synonym for the taxon\r