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

Added null check before deletion

Browse Source
This commit is contained in:
dylan
2016-03-15 08:59:30 +01:00
parent cd03d3a55f
commit fd82899e7a
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -77,6 +77,8 @@ public class ItemServiceImpl extends DSpaceObjectServiceImpl<Item> implements It
protected IdentifierService identifierService; protected IdentifierService identifierService;
@Autowired(required = true) @Autowired(required = true)
protected VersioningService versioningService; protected VersioningService versioningService;
@Autowired(required=true)
protected HarvestedItemService harvestedItemService;
protected ItemServiceImpl() protected ItemServiceImpl()
{ {
@@ -583,9 +585,11 @@ public class ItemServiceImpl extends DSpaceObjectServiceImpl<Item> implements It
authorizeService.authorizeAction(context, item, Constants.DELETE); authorizeService.authorizeAction(context, item, Constants.DELETE);
// Also delete the item if it appears in a harvested collection. // Also delete the item if it appears in a harvested collection.
HarvestedItemService harvestedItemService = HarvestServiceFactory.getInstance().getHarvestedItemService(); // autowire this.
HarvestedItem hi = harvestedItemService.find(context, item); HarvestedItem hi = harvestedItemService.find(context, item);
harvestedItemService.delete(context,hi); if(hi!=null)
{
harvestedItemService.delete(context, hi);
}
item.getCollections().clear(); item.getCollections().clear();
item.setOwningCollection(null); item.setOwningCollection(null);