From bac5b99cb28f9660cbf4bc54b7cb324272adece5 Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Fri, 29 Apr 2016 14:29:22 +0200
Subject: [PATCH] no-jira: fix NPE if task was deleted

---
 .../services/taskexecutor/model/PersistentTaskRunnable.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/olat/core/commons/services/taskexecutor/model/PersistentTaskRunnable.java b/src/main/java/org/olat/core/commons/services/taskexecutor/model/PersistentTaskRunnable.java
index 02eb8088d76..be859a618ad 100644
--- a/src/main/java/org/olat/core/commons/services/taskexecutor/model/PersistentTaskRunnable.java
+++ b/src/main/java/org/olat/core/commons/services/taskexecutor/model/PersistentTaskRunnable.java
@@ -57,7 +57,7 @@ public class PersistentTaskRunnable implements Runnable {
 		} catch (Throwable e) {
 			DBFactory.getInstance().rollbackAndCloseSession();
 			markAsFailed(task);
-			log.error("Error while running task in a separate thread: " + task.getKey(), e);
+			log.error("Error while running task in a separate thread: " + (task == null ? "NULL" : task.getKey()), e);
 		}
 	}
 	
-- 
GitLab