exception for lock failures

GlobalDataverseCommunityConsortium · Nov 6, 2024 · 4fd710b · 4fd710b
1 parent 898d8c6
commit 4fd710b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/DatasetServiceBean.java
@@ -450,7 +450,8 @@ public DatasetLock addDatasetLock(Long datasetId, DatasetLock.Reason reason, Lon
         // (to prevent multiple, duplicate locks on the dataset!)
         DatasetLock lock = dataset.getLockFor(reason);
         if (lock != null) {
-            return lock;
+            //return lock;
+            return null;
         }
 
         // Create new:

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
@@ -14,6 +14,7 @@
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
 import edu.harvard.iq.dataverse.engine.command.RequiredPermissions;
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
+import edu.harvard.iq.dataverse.engine.command.exception.CommandExecutionException;
 import edu.harvard.iq.dataverse.engine.command.exception.IllegalCommandException;
 import edu.harvard.iq.dataverse.util.DatasetFieldUtil;
 import edu.harvard.iq.dataverse.util.FileMetadataUtil;
@@ -147,6 +148,7 @@ public Dataset execute(CommandContext ctxt) throws CommandException {
                 theDataset.addLock(lock);
             } else {
                 logger.log(Level.WARNING, "Failed to lock the dataset (dataset id={0})", getDataset().getId());
+                throw new CommandExecutionException("Failed to acquire lock on dataset", this);
             }
 
             editVersion.setDatasetFields(editVersion.initDatasetFields());