try changes from perf2 branch

GlobalDataverseCommunityConsortium · Nov 4, 2024 · 49c23b0 · 49c23b0
1 parent 41f8e11
commit 49c23b0
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateDatasetVersionCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateDatasetVersionCommand.java
@@ -143,6 +143,7 @@ public Dataset execute(CommandContext ctxt) throws CommandException {
             String lockInfoMessage = "saving current edits";
             DatasetLock lock = ctxt.datasets().addDatasetLock(getDataset().getId(), DatasetLock.Reason.EditInProgress, ((AuthenticatedUser) getUser()).getId(), lockInfoMessage);
             if (lock != null) {
+                lock = ctxt.em().merge(lock);
                 theDataset.addLock(lock);
             } else {
                 logger.log(Level.WARNING, "Failed to lock the dataset (dataset id={0})", getDataset().getId());
@@ -193,9 +194,11 @@ public Dataset execute(CommandContext ctxt) throws CommandException {
                     dataFile.setCreator((AuthenticatedUser) getUser());
                 }
                 dataFile.setModificationTime(getTimestamp());
+                dataFile.getLatestFileMetadata();
                 mergedFiles.add(dataFile);
             }
             theDataset.setFiles(mergedFiles);
+            editVersion.getFileMetadatas();
 
             //Kludge - for now, if there are any changes to anything other than the metadata fields, merge the whole version.
             if(//!dvDifference.getDatasetFilesDiffList().isEmpty() ||