ref #8389: minor
authorKatja Luther <k.luther@bgbm.org>
Thu, 5 Sep 2019 08:57:17 +0000 (10:57 +0200)
committerKatja Luther <k.luther@bgbm.org>
Thu, 5 Sep 2019 08:58:45 +0000 (10:58 +0200)
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java

index 02cd73d29735c9dcc1770f1b057a4f58e0ce0a6a..de048149946956ebeb8baa49766b9289089076cb 100644 (file)
@@ -1790,15 +1790,15 @@ public class PreferencesUtil implements IPreferenceKeys {
         CdmPreference pref = cache.get(PreferencePredicate.NameFeatures.getKey());
         List<Feature> terms = new ArrayList();
         boolean override = PreferencesUtil.getBooleanValue(PreferencesUtil.createOverridePreferenceString(PreferencePredicate.NameFeatures.getKey()));
-        if (pref != null){
-            List<UUID> uuids = PreferencesUtil.createUUIDListFromStringPref(pref.getPredicate());
-            if (uuids != null && !uuids.isEmpty()){
-                terms = CdmStore.getTermManager().getTerms(uuids, Feature.class);
-            }
+
+        List<UUID> uuids = PreferencesUtil.createUUIDListFromStringPref(PreferencePredicate.NameFeatures.getKey());
+        if (uuids != null && !uuids.isEmpty()){
+            terms = CdmStore.getTermManager().getTerms(uuids, Feature.class);
         }
 
 
 
+
        if (terms.isEmpty()){
            terms.addAll(TermStore.getTerms(CdmStore.getService(IVocabularyService.class).load(VocabularyEnum.NameFeature.getUuid()), null));