safely set datafile owner

Author: qqmyers

src/main/java/edu/harvard/iq/dataverse/engine/command/impl/CreateNewDataFilesCommand.java

@@ -610,19 +610,30 @@ public CreateDataFileResult execute(CommandContext ctxt) throws CommandException
 
 
         if (datafile != null) {
-         if(newStorageIdentifier != null) {
-             //Direct upload case
-             //Improve the MIMEType
-            String type = determineRemoteFileType(datafile, fileName);
-            if (!StringUtils.isBlank(type)) {
-                //Use rules for deciding when to trust browser supplied type
-                if (useRecognizedType(finalType, type)) {
-                    datafile.setContentType(type);
+            if (newStorageIdentifier != null) {
+                // Direct upload case
+                // Improve the MIMEType
+                // Need the owner for the StorageIO class to get the file/S3 path from the
+                // storageIdentifier
+                //Currently owner is null, but using this falg will avoid making changes here if that isn't true in the future
+                boolean ownerSet = datafile.getOwner() != null;
+                if (!ownerSet) {
+                    datafile.setOwner(version.getDataset());
+                }
+                String type = determineRemoteFileType(datafile, fileName);
+                if (!StringUtils.isBlank(type)) {
+
+                    // Use rules for deciding when to trust browser supplied type
+                    if (useRecognizedType(finalType, type)) {
+                        datafile.setContentType(type);
+                    }
+                    logger.fine("Supplied type: " + suppliedContentType + ", finalType: " + finalType);
+                }
+                // Avoid changing
+                if (!ownerSet) {
+                    datafile.setOwner(null);
                 }
-                logger.fine("Supplied type: " + suppliedContentType + ", finalType: " + finalType);
             }
-         }
-            
 
             if (warningMessage != null) {
                 createIngestFailureReport(datafile, warningMessage);