work

Author: thomaswoehlke

src/main/java/org/woehlke/java/simpleworklist/domain/AbstractController.java

@@ -187,15 +187,15 @@ protected UserSessionBean updateUserSession(UserSessionBean userSession){
 
     protected Project addProjectFromTaskToModel(Task task, Model model){
       Project thisProject;
-      if (task.getProject() == null || task.getProject().getId() == 0L ) {
+      if (task.getProject() == null || task.getProject().getId() == null || task.getProject().getId() == 0L) {
         thisProject = new Project();
         thisProject.setId(0L);
       } else {
         thisProject = task.getProject();
       }
       model.addAttribute("thisProject", thisProject);
       Project lastProject;
-      if (task.getLastProject() == null || task.getLastProject().getId() == 0L) {
+      if (task.getLastProject() == null || task.getLastProject().getId() == null || task.getLastProject().getId() == 0L) {
         lastProject = new Project();
         lastProject.setId(0L);
       } else {