From 75da2dbba00d6078066eda7e2affed7991c966ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?=
 <ogonzalez@igalia.com>
Date: Tue, 15 Jun 2010 23:34:27 +0200
Subject: [PATCH] ItEr60S04ValidacionEProbasFuncionaisItEr59S04: [Bug #526] Fix
 bug.

Check for null.
---
 .../org/navalplanner/web/resourceload/ResourceLoadModel.java  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadModel.java
index 9d9c0d97d..80eadecf6 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadModel.java
@@ -358,6 +358,10 @@ public class ResourceLoadModel implements IResourceLoadModel {
                     pageFilterPosition, getEndPositionForCriterionPageFilter());
         }
         for(Criterion criterion : criteriaList) {
+            if (genericAllocationsByCriterion.get(criterion) == null) {
+                // no allocations found for criterion
+                continue;
+            }
             List<GenericResourceAllocation> allocations = ResourceAllocation
                     .sortedByStartDate(genericAllocationsByCriterion
                             .get(criterion));