hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-17 15:03:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

DS-3179

Browse Source
This commit is contained in:
philip Vissenaekens
2016-06-20 16:49:53 +02:00
parent 61664027a2
commit eeab1106db
5 changed files with 2 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
dspace-api/src/main/java/org/dspace/content/BitstreamServiceImpl.java
View File

@@ -254,7 +254,6 @@ public class BitstreamServiceImpl extends DSpaceObjectServiceImpl<Bitstream> imp
bundle.getBitstreams().remove(bitstream);
}
//Remove all bundles from the bitstream object, clearing the connection in 2 ways
bundles.clear();
// Remove policies
@@ -263,8 +262,8 @@ public class BitstreamServiceImpl extends DSpaceObjectServiceImpl<Bitstream> imp
// Remove bitstream itself
bitstream.setDeleted(true);
update(context, bitstream);
// Remove policies from the file, we do this at the end since the methods above still require write rights.
authorizeService.removeAllPolicies(context, bitstream);
bundles.clear();
}
@Override

4
dspace-api/src/main/java/org/dspace/content/BundleServiceImpl.java
View File

@@ -412,10 +412,6 @@ public class BundleServiceImpl extends DSpaceObjectServiceImpl<Bundle> implement
item.removeBundle(bundle);
}
// remove our authorization policies
authorizeService.removeAllPolicies(context, bundle);
// Remove ourself
bundleDAO.delete(context, bundle);
}

3
dspace-api/src/main/java/org/dspace/content/CollectionServiceImpl.java
View File

@@ -744,9 +744,6 @@ public class CollectionServiceImpl extends DSpaceObjectServiceImpl<Collection> i
owningCommunity.getCollections().remove(collection);
}
// Remove all authorization policies
authorizeService.removeAllPolicies(context, collection);
collectionDAO.delete(context, collection);
}

3
dspace-api/src/main/java/org/dspace/content/CommunityServiceImpl.java
View File

@@ -527,9 +527,6 @@ public class CommunityServiceImpl extends DSpaceObjectServiceImpl<Community> imp
// Remove the logo
setLogo(context, community, null);
// Remove all authorization policies
authorizeService.removeAllPolicies(context, community);
// Remove any Handle
handleService.unbindHandle(context, community);

10
dspace-api/src/main/java/org/dspace/content/ItemServiceImpl.java
View File

@@ -294,18 +294,11 @@ public class ItemServiceImpl extends DSpaceObjectServiceImpl<Item> implements It
log.info(LogManager.getHeader(context, "remove_bundle", "item_id="
+ item.getID() + ",bundle_id=" + bundle.getID()));
item.removeBundle(bundle);
bundle.removeItem(item);
context.addEvent(new Event(Event.REMOVE, Constants.ITEM, item.getID(),
Constants.BUNDLE, bundle.getID(), bundle.getName(), getIdentifiers(context, item)));
if (CollectionUtils.isEmpty(bundle.getItems())) {
bundleService.delete(context, bundle);
}
}
@Override
public Bitstream createSingleBitstream(Context context, InputStream is, Item item, String name) throws AuthorizeException, IOException, SQLException {
@@ -618,9 +611,6 @@ public class ItemServiceImpl extends DSpaceObjectServiceImpl<Item> implements It
item.getCollections().clear();
item.setOwningCollection(null);
// remove all of our authorization policies
authorizeService.removeAllPolicies(context, item);
// Remove any Handle
handleService.unbindHandle(context, item);