From b19353dc6ec2b187948002e8a54d86603d62fc66 Mon Sep 17 00:00:00 2001 From: Philip Durbin Date: Wed, 15 Apr 2020 16:39:30 -0400 Subject: [PATCH] prevent label (filename) from being null #6821 The getOriginalFileName method only works on tabular files so call it early before the file becomes non-tabular. --- .../dataverse/engine/command/impl/UningestFileCommand.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UningestFileCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UningestFileCommand.java index 738c282f270..5690e58c3cc 100644 --- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UningestFileCommand.java +++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UningestFileCommand.java @@ -58,7 +58,9 @@ protected void executeImpl(CommandContext ctxt) throws CommandException { if (!uningest.isTabularData()) { throw new IllegalCommandException("UningestFileCommand called on a non-tabular data file (id="+uningest.getId()+")", this); } - + + String originalFileName = uningest.getOriginalFileName(); + StorageIO dataAccess = null; // size of the stored original: Long storedOriginalFileSize; @@ -139,7 +141,6 @@ protected void executeImpl(CommandContext ctxt) throws CommandException { // could be more than one: // String originalExtension = FileUtil.generateOriginalExtension(originalFileFormat); - String originalFileName = uningest.getOriginalFileName(); for (FileMetadata fm : uningest.getFileMetadatas()) { fm.setLabel(originalFileName);