From 454ff4330d311171f333846cf14fdcebacc30553 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lorenzo=20Tilve=20=C3=81lvaro?= <ltilve@igalia.com>
Date: Mon, 11 Feb 2013 00:51:29 +0100
Subject: [PATCH] Avoid NPE when sorting Labels and Criteria for user setting
 bandboxes

FEA: ItEr77S15FilteringEnhancements
---
 .../org/libreplan/web/users/settings/SettingsModel.java   | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/users/settings/SettingsModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/users/settings/SettingsModel.java
index 61ae7f496..41894b221 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/users/settings/SettingsModel.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/users/settings/SettingsModel.java
@@ -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)