CC review

Author: XingY

api/src/org/labkey/api/query/AbstractQueryImportAction.java

@@ -552,10 +552,10 @@ else if (getViewContext().getRequest() instanceof MultipartHttpServletRequest)
                 List<MultipartFile> uploadedFiles = getUploadedFiles();
                 if (!uploadedFiles.isEmpty())
                 {
-                    transactionDetails.put(TransactionAuditProvider.TransactionDetail.ImportFileName, multipartfile.getOriginalFilename());
                     hasPostData = true;
                     PipeRoot root = PipelineService.get().findPipelineRoot(getContainer());
                     originalName = uploadedFiles.getFirst().getOriginalFilename();
+                    transactionDetails.put(TransactionAuditProvider.TransactionDetail.ImportFileName, originalName);
 
                     FileLike dataFileDir = null;
 
@@ -652,7 +652,7 @@ else if (!dataFileDir.exists())
                 loader.close();
             if (null != file)
                 file.closeInputStream();
-            if (dataFiles.isEmpty() && !Boolean.parseBoolean(saveToPipeline) && !_useAsync)
+            if (!dataFiles.isEmpty() && !Boolean.parseBoolean(saveToPipeline) && !_useAsync)
             {
                 for (FileLike tmpFile : dataFiles)
                     tmpFile.delete();