From d09b0c60a1f8ea274253d0187c47cfc3ec3bbe1c Mon Sep 17 00:00:00 2001
From: Jens Vannerum <jens.vannerum@atmire.com>
Date: Wed, 8 Jun 2022 15:38:15 +0200
Subject: [PATCH 1/3] 88835: Feedback

---
 .../org/dspace/discovery/indexobject/IndexFactoryImpl.java  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/dspace-api/src/main/java/org/dspace/discovery/indexobject/IndexFactoryImpl.java b/dspace-api/src/main/java/org/dspace/discovery/indexobject/IndexFactoryImpl.java
index 8660bbebc7..d5f9062027 100644
--- a/dspace-api/src/main/java/org/dspace/discovery/indexobject/IndexFactoryImpl.java
+++ b/dspace-api/src/main/java/org/dspace/discovery/indexobject/IndexFactoryImpl.java
@@ -73,7 +73,11 @@ public abstract class IndexFactoryImpl<T extends IndexableObject, S> implements
     @Override
     public void writeDocument(Context context, T indexableObject, SolrInputDocument solrInputDocument)
             throws SQLException, IOException, SolrServerException {
-        writeDocument(solrInputDocument, null);
+        try {
+            writeDocument(solrInputDocument, null);
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+        }
     }
 
     /**

From 66b976bd5f87c4c9085e35ab9312529d40ad9082 Mon Sep 17 00:00:00 2001
From: Jens Vannerum <jens.vannerum@atmire.com>
Date: Thu, 9 Jun 2022 10:05:46 +0200
Subject: [PATCH 2/3] 88835: Improved logging message

---
 .../org/dspace/discovery/indexobject/IndexFactoryImpl.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dspace-api/src/main/java/org/dspace/discovery/indexobject/IndexFactoryImpl.java b/dspace-api/src/main/java/org/dspace/discovery/indexobject/IndexFactoryImpl.java
index d5f9062027..bcc494687b 100644
--- a/dspace-api/src/main/java/org/dspace/discovery/indexobject/IndexFactoryImpl.java
+++ b/dspace-api/src/main/java/org/dspace/discovery/indexobject/IndexFactoryImpl.java
@@ -76,7 +76,8 @@ public abstract class IndexFactoryImpl<T extends IndexableObject, S> implements
         try {
             writeDocument(solrInputDocument, null);
         } catch (Exception e) {
-            log.error(e.getMessage(), e);
+            log.error("Error occurred while writing SOLR document for {} object {} {}",
+                      indexableObject.getType(), indexableObject.getID(), e);
         }
     }
 

From 24a43dee8c2dea62405fd040cee14e0de0db83c6 Mon Sep 17 00:00:00 2001
From: Jens Vannerum <jens.vannerum@atmire.com>
Date: Thu, 9 Jun 2022 16:18:30 +0200
Subject: [PATCH 3/3] 88835: Removed unnecessary brackets

---
 .../java/org/dspace/discovery/indexobject/IndexFactoryImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dspace-api/src/main/java/org/dspace/discovery/indexobject/IndexFactoryImpl.java b/dspace-api/src/main/java/org/dspace/discovery/indexobject/IndexFactoryImpl.java
index bcc494687b..fd6b830cb9 100644
--- a/dspace-api/src/main/java/org/dspace/discovery/indexobject/IndexFactoryImpl.java
+++ b/dspace-api/src/main/java/org/dspace/discovery/indexobject/IndexFactoryImpl.java
@@ -76,7 +76,7 @@ public abstract class IndexFactoryImpl<T extends IndexableObject, S> implements
         try {
             writeDocument(solrInputDocument, null);
         } catch (Exception e) {
-            log.error("Error occurred while writing SOLR document for {} object {} {}",
+            log.error("Error occurred while writing SOLR document for {} object {}",
                       indexableObject.getType(), indexableObject.getID(), e);
         }
     }