Project

General

Profile

« Previous | Next » 

Revision 385d1194

Added by Patrick Plitzner almost 10 years ago

merge update from trunk

View differences:

cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DescriptionListPortalController.java
175 175
       PagerParameters pagerParams = new PagerParameters(pageSize, pageNumber);
176 176
       pagerParams.normalizeAndValidate(response);
177 177

  
178
       if(features == null){
179
           features = new DefinedTermBaseList<Feature>();
180
       }
181

  
178 182
       Pager<DescriptionElementBase> pager = service.pageDescriptionElements(null, descriptionType, features.asSet(),
179 183
               type, pagerParams.getPageSize(), pagerParams.getPageIndex(), DESCRIPTION_ELEMENT_INIT_STRATEGY);
180 184

  

Also available in: Unified diff