From: Katja Luther <k.luther@bgbm.org>
Date: Thu, 20 Feb 2020 11:22:32 +0000 (+0100)
Subject: avoid NPE in preferenceUtil and TermPreferencePages
X-Git-Tag: 5.13.0^2~83
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/98f05cec5c1c0c0690574890aa5010f07fd7e39c

avoid NPE in preferenceUtil and TermPreferencePages
---

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/AbstractGeneralTermPreference.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/AbstractGeneralTermPreference.java
index d5cc900c6..58b2618e8 100755
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/AbstractGeneralTermPreference.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/AbstractGeneralTermPreference.java
@@ -139,7 +139,9 @@ abstract public class AbstractGeneralTermPreference<T extends AbstractTermDto> e
                 useLocalOrAdmin.select(1);
             }else{
                 useLocalOrAdmin.select(0);
-                treeComposite.getViewer().getTree().setSelection(treeComposite.getViewer().getTree().getTopItem());
+                if (treeComposite.getViewer().getTree() != null && treeComposite.getViewer().getTree().getTopItem() != null) {
+                    treeComposite.getViewer().getTree().setSelection(treeComposite.getViewer().getTree().getTopItem());
+                }
                 treeComposite.setEnabled(false);
 
                 //treeComposite.getViewer().getTree().getVerticalBar().setEnabled(true);
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java
index ccef7c3df..07e90b569 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java
@@ -1939,7 +1939,7 @@ public class PreferencesUtil implements IPreferenceKeys {
         List<Feature> terms = null;
         boolean override = PreferencesUtil.getBooleanValue(PreferencesUtil.createOverridePreferenceString(PreferencePredicate.TaxonFeatures.getKey()));
         List<UUID> uuids = PreferencesUtil.createUUIDListFromStringPref(PreferencePredicate.TaxonFeatures.getKey(), false);
-        if (!uuids.isEmpty()){
+        if (uuids != null && !uuids.isEmpty()){
             terms = CdmStore.getTermManager().getTerms(uuids, Feature.class);
         }
         if (terms == null || terms.isEmpty()){