From e23f2980e024de6de1cb20fee462fdb4413afdee Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Wed, 31 Mar 2021 10:49:01 +0200
Subject: [PATCH] 77817: Add subject null check

---
 .../src/main/java/org/dspace/discovery/IndexEventConsumer.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dspace-api/src/main/java/org/dspace/discovery/IndexEventConsumer.java b/dspace-api/src/main/java/org/dspace/discovery/IndexEventConsumer.java
index 7c50865970..5f1f8b0b0e 100644
--- a/dspace-api/src/main/java/org/dspace/discovery/IndexEventConsumer.java
+++ b/dspace-api/src/main/java/org/dspace/discovery/IndexEventConsumer.java
@@ -160,7 +160,8 @@ public class IndexEventConsumer implements Consumer {
 
                     // If the event subject is a Collection and the event object is an Item,
                     // also update the object in order to index mapped/unmapped Items
-                    if (subject.getType() == Constants.COLLECTION && object.getType() == Constants.ITEM) {
+                    if (subject != null &&
+                        subject.getType() == Constants.COLLECTION && object.getType() == Constants.ITEM) {
                         objectsToUpdate.addAll(indexObjectServiceFactory.getIndexableObjects(ctx, object));
                     }
                 }