Project

General

Profile

« Previous | Next » 

Revision e974354a

Added by Patrick Plitzner over 5 years ago

ref #7849 Fix potential NPE

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/CommonNameNamedAreaSelectionDialog.java
68 68
    protected List<TermVocabulary> getAvailableVocabularies(){
69 69
        List<TermVocabulary> vocabularies = new ArrayList();
70 70

  
71
        if (!PreferencesUtil.getPreferenceStore().getBoolean(IPreferenceKeys.COMMON_NAME_AREA_VOCABULARIES_ALLOW_OVERRIDE)){
72
            UUID[] preselectedVocabularyUuids = createVocabularyUuidList();
71
        UUID[] preselectedVocabularyUuids = createVocabularyUuidList();
72
        if (!PreferencesUtil.getPreferenceStore().getBoolean(IPreferenceKeys.COMMON_NAME_AREA_VOCABULARIES_ALLOW_OVERRIDE)
73
                && preselectedVocabularyUuids!=null){
73 74

  
74 75
            for(int i=0;i<preselectedVocabularyUuids.length;i++){
75 76
                TermVocabulary preselectedVocabulary = CdmStore.getService(IVocabularyService.class).find(preselectedVocabularyUuids[i]);

Also available in: Unified diff