fix null pointer exception

ls1intum · Oct 20, 2019 · 306e7bd · 306e7bd
1 parent c1d71a2
commit 306e7bd
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/main/java/de/tum/in/www1/artemis/service/ProgrammingExerciseService.java b/src/main/java/de/tum/in/www1/artemis/service/ProgrammingExerciseService.java
@@ -1075,10 +1075,10 @@ public java.io.File exportStudentRepositories(Long exerciseId, List<ProgrammingE
                 repo = gitService.getOrCheckoutRepository(participation, repoDownloadClonePath);
                 gitService.resetToOriginMaster(repo); // start with clean state
 
-                if (repositoryExportOptions.isFilterLateSubmissions()) {
+                if (repositoryExportOptions.isFilterLateSubmissions() && repositoryExportOptions.getFilterLateSubmissionsDate() != null) {
                     log.debug("Filter late submissions for participation {}", participation.toString());
                     Optional<Submission> lastValidSubmission = participation.getSubmissions().stream()
-                            .filter(s -> s.getSubmissionDate().isBefore(repositoryExportOptions.getFilterLateSubmissionsDate()))
+                            .filter(s -> s.getSubmissionDate() != null && s.getSubmissionDate().isBefore(repositoryExportOptions.getFilterLateSubmissionsDate()))
                             .max(Comparator.comparing(Submission::getSubmissionDate));
 
                     gitService.filterLateSubmissions(repo, lastValidSubmission, repositoryExportOptions.getFilterLateSubmissionsDate());