test/cuba
1
0
Fork 0
mirror of https://gitee.com/jmix/cuba.git synced 2024-12-04 20:28:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

NPE when enter blank string into maximum results field in WebFilter #PL-3005

Browse Source
This commit is contained in:
Ilya Chekashkin 2013-10-28 10:09:42 +00:00
parent 6943289dda
commit 550b60b2f0
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
modules/web/src/com/haulmont/cuba/web/gui/components/WebFilter.java
View File

@ -433,16 +433,19 @@ public class WebFilter extends WebAbstractComponent<CubaVerticalActionsLayout> i
applyDatasourceFilter();
if (useMaxResults) {
int maxResults;
if (BooleanUtils.isTrue(maxResultsCb.getValue()))
int maxResults = 0;
if (BooleanUtils.isTrue(maxResultsCb.getValue())) {
String maxResultsFieldValue = maxResultsField.getValue();
if (StringUtils.isNotBlank(maxResultsFieldValue)) {
try {
//noinspection ConstantConditions
maxResults = Datatypes.get(Integer.class).parse(maxResultsField.getValue(), userSessionSource.getLocale());
maxResults = Datatypes.get(Integer.class).parse(maxResultsFieldValue, userSessionSource.getLocale());
} catch (ParseException e) {
throw new Validator.InvalidValueException("");
}
else
} else
maxResults = persistenceManager.getMaxFetchUI(datasource.getMetaClass().getName());
}
datasource.setMaxResults(maxResults);
}
if (datasource instanceof CollectionDatasource.SupportsPaging)