From d953421361becdebc2f0d2db48f9be924231a331 Mon Sep 17 00:00:00 2001
From: juanf <juanf@ethz.ch>
Date: Tue, 11 Jun 2024 11:56:19 +0200
Subject: [PATCH] BIS-1059: Bugfix null pointer

---
 .../generic/server/xls/importer/delay/DelayedExecution.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/delay/DelayedExecution.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/delay/DelayedExecution.java
index 53ad6a53d97..77ae11c0b93 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/delay/DelayedExecution.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/delay/DelayedExecution.java
@@ -64,7 +64,9 @@ public class DelayedExecution
             return false;
         }
         DelayedExecution that = (DelayedExecution) o;
-        return creationOrUpdate.getClass() == that.creationOrUpdate.getClass() && identifier.equals(that.identifier);
+        return creationOrUpdate.getClass() == that.creationOrUpdate.getClass() &&
+                identifier != null &&
+                identifier.equals(that.identifier);
     }
 
     @Override
-- 
GitLab