RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Avoid NPE when sorting Labels and Criteria for user setting bandboxes

Browse source 
FEA: ItEr77S15FilteringEnhancements
This commit is contained in:
Lorenzo Tilve Álvaro 2013-02-11 00:51:29 +01:00
parent 7fe5eb2350
commit 454ff4330d
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libreplan-webapp/src/main/java/org/libreplan/web/users/settings/SettingsModel.java
View file

@ -105,7 +105,9 @@ public class SettingsModel implements ISettingsModel {
for (Label label : allLabels) {
label.getType().getName();
}
Collections.sort(allLabels);
if ((allLabels != null) && (!allLabels.isEmpty())) {
Collections.sort(allLabels);
}
}
@Transactional(readOnly = true)
@ -115,7 +117,9 @@ public class SettingsModel implements ISettingsModel {
for (Criterion criterion : allCriteria) {
criterion.getType().getName();
}
Collections.sort(allCriteria);
if ((allCriteria != null) && (!allCriteria.isEmpty())) {
Collections.sort(allCriteria);
}
}
@Transactional(readOnly = true)