Project

General

Profile

« Previous | Next » 

Revision 70c47956

Added by Katja Luther over 6 years ago

fix #7127: fix NPE and dangling meta character in selection dialogs

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/GrantedAuthoritySelectionDialog.java
65 65
		model = new ArrayList<UuidAndTitleCache<GrantedAuthorityImpl>>();
66 66

  
67 67
		for(GrantedAuthorityImpl authority : authorities){
68
		    if (authority.getAuthority().matches(pattern)){
68
		    if ( pattern == null || authority.getAuthority().matches(pattern +".*")){
69 69
		        model.add(new UuidAndTitleCache<GrantedAuthorityImpl>(GrantedAuthorityImpl.class, authority.getUuid(), authority.getId(), String.format("%s", GrantedAuthorityLabelTextProvider.getText(authority))));
70 70
		    }
71 71
		}

Also available in: Unified diff