Skip to content
Snippets Groups Projects
Commit 6eb9c4d8 authored by srosse's avatar srosse
Browse files

OO-3803: the list of submitted documents can be null in rare case

parent 99fccc32
No related branches found
No related tags found
No related merge requests found
...@@ -260,11 +260,11 @@ public class GTAParticipantController extends GTAAbstractController implements A ...@@ -260,11 +260,11 @@ public class GTAParticipantController extends GTAAbstractController implements A
File documentsDir; File documentsDir;
VFSContainer documentsContainer; VFSContainer documentsContainer;
if(GTAType.group.name().equals(config.getStringValue(GTACourseNode.GTASK_TYPE))) { if(GTAType.group.name().equals(config.getStringValue(GTACourseNode.GTASK_TYPE))) {
documentsDir = gtaManager.getSubmitDirectory(courseEnv, gtaNode, assessedGroup);
documentsContainer = gtaManager.getSubmitContainer(courseEnv, gtaNode, assessedGroup); documentsContainer = gtaManager.getSubmitContainer(courseEnv, gtaNode, assessedGroup);
documentsDir = gtaManager.getSubmitDirectory(courseEnv, gtaNode, assessedGroup);
} else { } else {
documentsDir = gtaManager.getSubmitDirectory(courseEnv, gtaNode, getIdentity());
documentsContainer = gtaManager.getSubmitContainer(courseEnv, gtaNode, getIdentity()); documentsContainer = gtaManager.getSubmitContainer(courseEnv, gtaNode, getIdentity());
documentsDir = gtaManager.getSubmitDirectory(courseEnv, gtaNode, getIdentity());
} }
DueDate dueDate = getSubmissionDueDate(task); DueDate dueDate = getSubmissionDueDate(task);
......
...@@ -177,6 +177,9 @@ class SubmitDocumentsController extends FormBasicController { ...@@ -177,6 +177,9 @@ class SubmitDocumentsController extends FormBasicController {
private void updateModel() { private void updateModel() {
File[] documents = documentsDir.listFiles(new SystemFileFilter(true, false)); File[] documents = documentsDir.listFiles(new SystemFileFilter(true, false));
if(documents == null) {
documents = new File[0];
}
List<SubmittedSolution> docList = new ArrayList<>(documents.length); List<SubmittedSolution> docList = new ArrayList<>(documents.length);
for(File document:documents) { for(File document:documents) {
String filename = document.getName(); String filename = document.getName();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment