try remove first

IQSS · Dec 12, 2024 · da06fea · da06fea
1 parent 1bd6d58
commit da06fea
Showing 1 changed file with 5 additions and 3 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
@@ -243,20 +243,22 @@ public Dataset execute(CommandContext ctxt) throws CommandException {
                     // and remove the file from the dataset's list
                     theDataset.getFiles().remove(fmd.getDataFile());
                     ctxt.em().remove(fmd.getDataFile());
+                    ctxt.em().remove(fmd);
                 } else {
+                    ctxt.em().remove(fmd);
                     // if we aren't removing the file, we need to remove it from the datafile's list
                     FileMetadataUtil.removeFileMetadataFromList(fmd.getDataFile().getFileMetadatas(), fmd);
                 }
-                // In either case, to fully remove the fmd, we have to remove any other possible
+                // In either case, we've removed from the  context 
+                // And, to fully remove the fmd, we have to remove any other possible
                 // references
                 // From the datasetversion
                 FileMetadataUtil.removeFileMetadataFromList(theDataset.getOrCreateEditVersion().getFileMetadatas(), fmd);
                 // and from the list associated with each category
                 for (DataFileCategory cat : theDataset.getCategories()) {
                     FileMetadataUtil.removeFileMetadataFromList(cat.getFileMetadatas(), fmd);
                 }
-                // And the context 
-                ctxt.em().remove(fmd);
+
             }
             for(FileMetadata fmd: theDataset.getOrCreateEditVersion().getFileMetadatas()) {
                 logger.fine("FMD: " + fmd.getId() + " for file: " + fmd.getDataFile().getId() + "is in final draft version");