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

Merge remote-tracking branch 'upstream/master' into DS-3179-jspui-remove-file

Browse Source 
Conflicts:
	dspace-api/src/main/java/org/dspace/content/ItemServiceImpl.java
This commit is contained in:
philip Vissenaekens
2016-06-20 15:48:12 +02:00
parent 5ebaf76eea 764070205d
commit b1e4d3980b
671 changed files with 11528 additions and 7483 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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