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

OO-1320: catch the case where the uploaded file is null

parent 6c29461d
No related branches found
No related tags found
No related merge requests found
...@@ -199,18 +199,25 @@ public class ImportRepositoryEntryController extends FormBasicController { ...@@ -199,18 +199,25 @@ public class ImportRepositoryEntryController extends FormBasicController {
private void doAnalyseUpload() { private void doAnalyseUpload() {
File uploadedFile = uploadFileEl.getUploadFile(); File uploadedFile = uploadFileEl.getUploadFile();
String uploadedFilename = uploadFileEl.getUploadFileName(); if(uploadedFile == null) {//OO-1320
typeEl.setVisible(false);
List<ResourceHandler> handlers = new ArrayList<>(3); selectType.setVisible(false);
for(String type:repositoryHandlerFactory.getSupportedTypes()) { uploadFileEl.reset();
RepositoryHandler handler = repositoryHandlerFactory.getRepositoryHandler(type); importButton.setEnabled(false);
ResourceEvaluation eval = handler.acceptImport(uploadedFile, uploadedFilename); } else {
if(eval != null && eval.isValid()) { String uploadedFilename = uploadFileEl.getUploadFileName();
handlers.add(new ResourceHandler(handler, eval));
List<ResourceHandler> handlers = new ArrayList<>(3);
for(String type:repositoryHandlerFactory.getSupportedTypes()) {
RepositoryHandler handler = repositoryHandlerFactory.getRepositoryHandler(type);
ResourceEvaluation eval = handler.acceptImport(uploadedFile, uploadedFilename);
if(eval != null && eval.isValid()) {
handlers.add(new ResourceHandler(handler, eval));
}
} }
updateResourceInfos(handlers);
} }
updateResourceInfos(handlers);
} }
private void updateResourceInfos(List<ResourceHandler> handlers) { private void updateResourceInfos(List<ResourceHandler> handlers) {
......
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