ref #10340 fix potential NPE

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/ModifierElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/ModifierElement.java
index e0aafa36843a6d1018fa52b51bd43d637d6577bb..b4b445825b852a6738c470398dfe077e91354105 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/ModifierElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/ModifierElement.java
@@ -57,6 +57,8 @@ public class ModifierElement extends AbstractEntityCollectionElement<DefinedTerm
                this.entity = entity;
                if (combo_modifier != null){
                        if(getParentElement() instanceof ModifierSection){
+                           //TODO is that called at all
+
                            ModifierSection parentSection = (ModifierSection) getParentElement();
                            List<DefinedTerm> modifierTerms = new ArrayList<>();
 
@@ -75,8 +77,10 @@ public class ModifierElement extends AbstractEntityCollectionElement<DefinedTerm
                            Set<TermCollection<DefinedTerm,?>> recommendedModifierEnumeration =
                                    feature == null ? null : feature.getRecommendedModifierEnumeration();
 
-                           for (TermCollection<DefinedTerm,?> termCollection : recommendedModifierEnumeration) {
-                               modifierTerms.addAll(termCollection.getDistinctTerms());
+                           if (recommendedModifierEnumeration != null){
+                               for (TermCollection<DefinedTerm,?> termCollection : recommendedModifierEnumeration) {
+                                   modifierTerms.addAll(termCollection.getDistinctTerms());
+                               }
                            }
                            combo_modifier.setTerms(modifierTerms);
                        }