From 0628b074581e975d27be2cdc77497c4ec411b08f Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Tue, 15 Mar 2011 10:26:49 +0100 Subject: [PATCH] [Bug #934] Fixed problem with calendar creating a new resource. FEA : ItEr72S04BugFixing --- .../java/org/navalplanner/web/calendars/BaseCalendarModel.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarModel.java index 54cffdb15..3bafa8d15 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarModel.java @@ -566,6 +566,9 @@ public class BaseCalendarModel extends IntegrationEntityModel implements @Override public boolean isOwnException(CalendarException exception) { + if (getBaseCalendar() == null) { + return false; + } return getBaseCalendar().getOwnExceptions().contains(exception); }