fix exception when publish flag preference is not set
authorKatja Luther <k.luther@bgbm.org>
Mon, 14 May 2018 16:19:59 +0000 (18:19 +0200)
committerKatja Luther <k.luther@bgbm.org>
Mon, 14 May 2018 16:20:52 +0000 (18:20 +0200)
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeWizardPage.java

index 135772aac80eac833fc8685a0912a4e8ee43a94a..6a38a740d4d7aa75732d65ca70dcd14d7d81845d 100644 (file)
@@ -16,6 +16,7 @@ import org.eclipse.swt.widgets.Listener;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.common.CdmUtils;
+import eu.etaxonomy.cdm.model.metadata.CdmPreference;
 import eu.etaxonomy.cdm.model.metadata.PreferencePredicate;
 import eu.etaxonomy.cdm.model.name.INonViralName;
 import eu.etaxonomy.cdm.model.reference.Reference;
@@ -142,9 +143,11 @@ public class TaxonNodeWizardPage extends AbstractCdmEntityWizardPage<ITaxonTreeN
                        Reference reference = ((TaxonNodeDetailElement) getDetailElement()).getReference();
                        INonViralName parseReferencedName = ParseHandler.parseReferencedName(taxonName, null);
                        Taxon taxon = Taxon.NewInstance(parseReferencedName, reference);
-                       if (PreferencesUtil.getPreferenceFromDB(PreferencePredicate.DefaultBehaviourForPublishFlag).getValue().equals(Messages.PublishFlagPreference_set)){
+                       CdmPreference defaultPublish = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.DefaultBehaviourForPublishFlag);
+
+                       if (defaultPublish != null && defaultPublish.getValue().equals(Messages.PublishFlagPreference_set)){
                            taxon.setPublish(true);
-                       } else if (PreferencesUtil.getPreferenceFromDB(PreferencePredicate.DefaultBehaviourForPublishFlag).getValue().equals(Messages.PublishFlagPreference_do_not_set)){
+                       } else if (defaultPublish != null && defaultPublish.equals(Messages.PublishFlagPreference_do_not_set)){
                            taxon.setPublish(false);
                        }else{
                            taxon.setPublish(((TaxonNode)this.getParentTreeNode()).getTaxon().isPublish());