From a659c671fb44dcbe70f5fc45bd1baec2dcd79540 Mon Sep 17 00:00:00 2001
From: Susana Montes Pedreira <smontes@wirelessgalicia.com>
Date: Mon, 12 Jul 2010 10:36:49 +0200
Subject: [PATCH]  ItEr60S04ValidacionEProbasFuncionaisItEr59S04 : [Bug #549]
 Fix bug.

it checks if the collection is null before using it.
---
 .../web/resourceload/ResourceLoadModel.java            | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

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 f1014af75..7c30b54fb 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
@@ -457,6 +457,10 @@ public class ResourceLoadModel implements IResourceLoadModel {
             Map<Order, List<ResourceAllocation<?>>> byOrder) {
         List<LoadTimeLine> result = new ArrayList<LoadTimeLine>();
         for (Order order : byOrder.keySet()) {
+            if (byOrder.get(order) == null) {
+                // no allocations found for order
+                continue;
+            }
             TimeLineRole<BaseEntity> role = getCurrentTimeLineRole(order);
             result.add(new LoadTimeLine(buildTimeLine(criterion, order
                     .getName(), "global-generic", byOrder.get(order), role),
@@ -585,9 +589,11 @@ public class ResourceLoadModel implements IResourceLoadModel {
         Map<Order, List<ResourceAllocation<?>>> byOrder = byOrder(sortedByStartDate);
 
         if (filter()) {
-            // build time lines for current order
-            result.addAll(buildTimeLinesForOrder(resource, byOrder
+            if (byOrder.get(filterBy) != null) {
+                // build time lines for current order
+                result.addAll(buildTimeLinesForOrder(resource, byOrder
                     .get(filterBy)));
+            }
             byOrder.remove(filterBy);
             // build time lines for other orders
             LoadTimeLine lineOthersOrders = buildTimeLinesForOtherOrders(