fix #6469 handle null value for bulk editor UUID search

[taxeditor.git] / eu.etaxonomy.taxeditor.bulkeditor / src / main / java / eu / etaxonomy / taxeditor / bulkeditor / input / AbstractBulkEditorInput.java

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AbstractBulkEditorInput.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AbstractBulkEditorInput.java
index 685bd8186f6031295a95cda719c8b3cd9308c643..2d9c59d181f1335bd682252109bbad65fa8d4429 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AbstractBulkEditorInput.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AbstractBulkEditorInput.java
@@ -269,8 +269,10 @@ public abstract class AbstractBulkEditorInput<T extends CdmBase>
             try {
                 UUID uuid = UUID.fromString(titleSearchString);
                 T entity = loadEntity(uuid);
-                //UUID search found -> add entity to list and return
-                model.add(entity);
+                //UUID search found -> add entity to list if not null and return
+                if (entity != null){
+                    model.add(entity);
+                }
                 return;
             } catch (IllegalArgumentException e) {
                 // search string was no UUID