remove lock in transaction

GlobalDataverseCommunityConsortium · Oct 31, 2024 · 0958193 · 0958193
1 parent 23569a3
commit 0958193
Showing 1 changed file with 20 additions and 4 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
@@ -18,6 +18,7 @@
 import edu.harvard.iq.dataverse.util.FileMetadataUtil;
 
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -276,13 +277,28 @@ public Dataset execute(CommandContext ctxt) throws CommandException {
                 AuthenticatedUser au = (AuthenticatedUser) getUser();
                 ctxt.datasetVersion().writeEditVersionLog(dvd, au);
             }
+            if ( theDataset != null ) {
+                final Dataset lockedDataset=theDataset;
+                logger.info("Locks found: " + theDataset.getLocks().size());
+                new HashSet<>(lockedDataset.getLocks()).stream()
+                        .filter( l -> l.getReason() == DatasetLock.Reason.EditInProgress )
+                        .forEach( existingLock -> {
+                            existingLock = ctxt.em().merge(existingLock);
+                            lockedDataset.removeLock(existingLock);
+
+                            AuthenticatedUser user = existingLock.getUser();
+                            user.getDatasetLocks().remove(existingLock);
+
+                            ctxt.em().remove(existingLock);
+                        });
+            }
         } finally {
             // We're done making changes - remove the lock...
-            //Failures above may occur before savedDataset is set, in which case we need to remove the lock on theDataset instead
-            if(savedDataset!=null) {
-            ctxt.datasets().removeDatasetLocks(savedDataset, DatasetLock.Reason.EditInProgress);
-            } else {
+            //Only happens if an exception has caused us to miss the lock removal in this transaction
+            if(!theDataset.getLocks().isEmpty()) {
                 ctxt.datasets().removeDatasetLocks(theDataset, DatasetLock.Reason.EditInProgress);
+            } else {
+                logger.fine("No locks to remove");
             }
         }