From d6969ebfe446a9916b31c1102ad52414d209751d Mon Sep 17 00:00:00 2001
From: =?utf8?q?Andreas=20M=C3=BCller?= <a.mueller@bgbm.org>
Date: Thu, 25 Jun 2020 00:10:18 +0200
Subject: [PATCH] ref #9078 fix null entity handling in
 ConversationalTransientEntityCacher

---
 .../remoting/cache/ConversationalTransientEntityCacher.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/cache/ConversationalTransientEntityCacher.java b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/cache/ConversationalTransientEntityCacher.java
index ac25be920..fbf429108 100755
--- a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/cache/ConversationalTransientEntityCacher.java
+++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/cache/ConversationalTransientEntityCacher.java
@@ -36,7 +36,9 @@ public class ConversationalTransientEntityCacher extends CdmTransientEntityCache
         // probably a good time to broadcast to other sessions
 
         Set<CdmBase> updatedObjects = result.getUpdatedObjects();
-        updatedObjects.add(result.getCdmEntity());
+        if (result.getCdmEntity()!= null){
+            updatedObjects.add(result.getCdmEntity());
+        }
         Set<CdmBase> reloadedObjects = new HashSet<>();
         Set<CdmEntityIdentifier> updatedCdmIds = result.getUpdatedCdmIds();
         boolean updatedCdmIdsIsEmpty = updatedCdmIds.isEmpty();
-- 
2.34.1