fix conflict

2025-10-14 05:23:14 +00:00 · 2016-04-07 16:31:10 +02:00
parent b19189634d
commit 8db0faed33
102 changed files with 665 additions and 535 deletions
--- a/dspace-api/src/main/java/org/dspace/content/ItemServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/content/ItemServiceImpl.java
@@ -610,14 +610,9 @@ public class ItemServiceImpl extends DSpaceObjectServiceImpl<Item> implements It
        log.info(LogManager.getHeader(context, "delete_item", "item_id="
                + item.getID()));

-        deleteMetadata(context, item);
-
        // Remove bundles
        removeAllBundles(context, item);

-        // remove all of our authorization policies
-        authorizeService.removeAllPolicies(context, item, false);
-
        // Remove any Handle
        handleService.unbindHandle(context, item);