Skip to content

[Port to dtq-dev] Issue dspace-customers#903: fix SWORDv2 item double-delete with WorkflowManagerDefault #1407

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
milanmajchrak merged 3 commits into from
Aug 14, 2026
Merged

[Port to dtq-dev] Issue dspace-customers#903: fix SWORDv2 item double-delete with WorkflowManagerDefault #1407

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
15bfb13
fix(swordv2): guard against double-delete in ContainerManagerDSpace.r…
jr-rk Aug 11, 2026
4e9e976
refactor(swordv2): harden isItemAlreadyDeleted guard
jr-rk Aug 12, 2026
2e85069
refactor(swordv2): keep deleteWrapper on workspace delete path
jr-rk Aug 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 28 additions & 2 deletions dspace-swordv2/src/main/java/org/dspace/sword2/ContainerManagerDSpace.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import java.util.List;
import java.util.Map;
import java.util.TreeMap;
import java.util.UUID;

import org.apache.logging.log4j.Logger;
import org.dspace.authorize.AuthorizeException;
Expand All @@ -25,6 +26,7 @@
import org.dspace.core.Constants;
import org.dspace.core.Context;
import org.dspace.core.LogHelper;
import org.dspace.event.Event;
import org.dspace.workflow.WorkflowItem;
import org.dspace.workflow.WorkflowItemService;
import org.dspace.workflow.factory.WorkflowServiceFactory;
Expand Down Expand Up @@ -755,14 +757,18 @@ protected void doContainerDelete(SwordContext swordContext, Item item,
WorkflowTools wft = new WorkflowTools();
if (wft.isItemInWorkspace(swordContext.getContext(), item)) {
WorkspaceItem wsi = wft.getWorkspaceItem(context, item);
// remove only the workspace wrapper row; the item itself is deleted below.
workspaceItemService.deleteWrapper(context, wsi);
} else if (wft.isItemInWorkflow(context, item)) {
WorkflowItem wfi = wft.getWorkflowItem(context, item);
workflowItemService.deleteWrapper(context, wfi);
}

// then delete the item
itemService.delete(context, item);
// then delete the item, unless an upstream method already queued its deletion
// in this transaction (safety net against a double itemService.delete()).
if (!isItemAlreadyDeleted(context, item.getID())) {
itemService.delete(context, item);
}
} catch (SQLException | IOException e) {
throw new DSpaceSwordException(e);
} catch (AuthorizeException e) {
Expand All @@ -788,4 +794,24 @@ private Item getDSpaceTarget(Context context, String editUrl,

return item;
}

/**
* Returns true if a DELETE event for this item is already queued on the context
* (i.e. the item was deleted earlier in this transaction), so the caller can skip
* a second {@code itemService.delete()} that would otherwise fail.
*/
private boolean isItemAlreadyDeleted(Context context, UUID itemUUID) {
if (context.getEvents() == null) {
return false;
}

for (Event event : context.getEvents()) {
if (event.getEventType() == Event.DELETE
&& event.getSubjectType() == Constants.ITEM
&& itemUUID.equals(event.getSubjectID())) {
return true;
}
}
return false;
}
}
Loading