when model in project doesn't exist project update doesn't crash

service/src/main/java/lcsb/mapviewer/services/impl/ProjectService.java

@@ -870,17 +870,16 @@ public class ProjectService implements IProjectService {
 
           modelDao.update(originalModel);
 
-
           if (params.isAnalyzeAnnotations()) {
             analyzeAnnotations(originalModel, params);
           }
           Logger.getRootLogger().removeAppender(appender);
           project.addLoggingInfo(appender);
-          
+
           if (params.isCacheModel()) {
             cacheData(originalModel, params);
           }
-          
+
           updateProjectStatus(project, ProjectStatus.DONE, IProgressUpdater.MAX_PROGRESS, params);
           if (project.getNotifyEmail() != null && !project.getNotifyEmail().equals("")) {
             try {
@@ -1351,7 +1350,10 @@ public class ProjectService implements IProjectService {
   public void updateProject(Project project, String token) throws SecurityException {
     projectDao.update(project);
     if (token != null) {
-      modelService.getLastModelByProjectId(project.getProjectId(), token).setProject(project);
+      Model model = modelService.getLastModelByProjectId(project.getProjectId(), token);
+      if (model != null) {
+        model.setProject(project);
+      }
     }
   }
 

service/src/test/java/lcsb/mapviewer/services/impl/ProjectServiceTest.java

@@ -780,4 +780,20 @@ public class ProjectServiceTest extends ServiceTestFunctions {
     }
   }
 
+  @Test
+  public void testUpdateProjectWithoutModel() throws Exception {
+    try {
+      createUser();
+
+      Project project = new Project();
+      project.setProjectId(projectId);
+      projectDao.add(project);
+      projectService.updateProject(project, adminToken);
+      projectService.removeProject(project, null, false, adminToken);
+    } catch (Exception e) {
+      e.printStackTrace();
+      throw e;
+    }
+  }
+
 }