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 d5cc900c6ce91424ed2ea431ab20e8a66439505d..58b2618e8e4adaedab509ba2564b47031666d779 100755 (executable)
--- 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 ccef7c3df9aada9633eecb19de889dbafcc61bef..07e90b5693e97fa577e77a798208c0fd39e7f120 100644 (file)
--- 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()){