From fd82899e7a8481e16d6ee10d090358aa7cc5b608 Mon Sep 17 00:00:00 2001
From: dylan <dylan.meeus@atmire.com>
Date: Tue, 15 Mar 2016 08:59:30 +0100
Subject: [PATCH] Added null check before deletion

---
 .../src/main/java/org/dspace/content/ItemServiceImpl.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

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