Merge branch 'OpenOLAT_14.2' into OpenOLAT_15.0

src/main/java/org/olat/core/commons/services/vfs/ui/version/VFSTrashController.java

@@ -209,7 +209,9 @@ public class VFSTrashController extends FormBasicController implements ProgressD
 	private void doDelete(List<VersionsDeletedFileRow> rowsToDelete) {
 		for(VersionsDeletedFileRow row:rowsToDelete) {
 			VFSRevision revision = vfsRepositoryService.getRevision(new VFSRevisionRefImpl(row.getRevisionKey()));
-			doDelete(revision);
+			if(revision != null) {
+				doDelete(revision);
+			}
 		}
 	}
 	

src/main/java/org/olat/course/assessment/manager/AssessmentNotificationsHandler.java

@@ -351,9 +351,9 @@ public class AssessmentNotificationsHandler implements NotificationsHandler {
 					for (CourseNode test:testNodes) {
 						List<AssessmentEntry> assessments = courseNodeAssessmentDao.loadAssessmentEntryBySubIdent(cgm.getCourseEntry(), test.getIdent());
 						for(AssessmentEntry assessment:assessments) {
-							Date modDate = assessment.getLastModified();
+							Date modDate = getLater(assessment.getLastUserModified(), assessment.getLastCoachModified());
 							Identity assessedIdentity = assessment.getIdentity();
-							if (modDate.after(compareDate) && (hasFullAccess || coachedUsers.contains(assessedIdentity))) {
+							if (modDate != null && modDate.after(compareDate) && (hasFullAccess || coachedUsers.contains(assessedIdentity))) {
 								BigDecimal score = assessment.getScore();
 								if(test instanceof ScormCourseNode) {
 									ScormCourseNode scormTest = (ScormCourseNode)test;
@@ -405,6 +405,13 @@ public class AssessmentNotificationsHandler implements NotificationsHandler {
 		}
 	}
 	
+	private Date getLater(Date date1, Date date2) {
+		if (date1 == null) return date2;
+		if (date2 == null) return date1;
+		
+		return date1.after(date2)? date1: date2;
+	}
+	
 	private void checkPublisher(Publisher p) {
 		try {
 			if(!NotificationsUpgradeHelper.checkCourse(p)) {