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

ItEr60S04ValidacionEProbasFuncionaisItEr59S04 : [Bug #549] Fix bug.

Browse source 
it checks if the collection is null before using it.
This commit is contained in:
Susana Montes Pedreira 2010-07-12 10:36:49 +02:00 • committed by Javier Moran Rua
parent 4f14ed9292
commit a659c671fb
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadModel.java
View file

@ -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(