Project

General

Profile

« Previous | Next » 

Revision 10d75c61

Added by Andreas Kohlbecker over 5 years ago

fix #7583 adding null check for authentication

View differences:

src/main/java/eu/etaxonomy/cdm/vaadin/view/registration/ListPresenter.java
258 258
     */
259 259
    public SearchFilter loadFilterFromView() {
260 260

  
261
        Authentication authentication = currentSecurityContext().getAuthentication();
262 261

  
263 262
        SearchFilter filter = new SearchFilter();
264 263
        filter.identifierPattern = getView().getIdentifierFilter().getValue();
......
269 268
                filter.submitter = (User)o;
270 269
            }
271 270
        } else {
272
            if(authentication.getPrincipal() != null && authentication.getPrincipal() instanceof User){
271
            Authentication authentication = currentSecurityContext().getAuthentication();
272
            if(authentication != null && authentication.getPrincipal() != null && authentication.getPrincipal() instanceof User){
273 273
                filter.submitter = (User) authentication.getPrincipal();
274 274
            }
275 275
        }

Also available in: Unified diff