From 9fd75f2b72b28223c612aa653ffc3dec7636dae9 Mon Sep 17 00:00:00 2001
From: georgweiss <georg.weiss@ess.eu>
Date: Fri, 1 Mar 2024 14:10:22 +0100
Subject: [PATCH] Fix NPE when creating log entry

---
 .../java/org/phoebus/logbook/olog/ui/LogEntryTableApp.java  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/logbook/olog/ui/src/main/java/org/phoebus/logbook/olog/ui/LogEntryTableApp.java b/app/logbook/olog/ui/src/main/java/org/phoebus/logbook/olog/ui/LogEntryTableApp.java
index a7bb74de53..c50ca88d73 100644
--- a/app/logbook/olog/ui/src/main/java/org/phoebus/logbook/olog/ui/LogEntryTableApp.java
+++ b/app/logbook/olog/ui/src/main/java/org/phoebus/logbook/olog/ui/LogEntryTableApp.java
@@ -74,6 +74,10 @@ public LogClient getClient() {
      * @param logEntry A new or updated {@link LogEntry}
      */
     public void handleLogEntryChange(LogEntry logEntry){
-        logEntryTable.logEntryChanged(logEntry);
+        // At this point the logEntryTable might be null, e.g. if log entry editor is launched
+        // before first launch of log entry table app.
+        if(logEntryTable != null){
+            logEntryTable.logEntryChanged(logEntry);
+        }
     }
 }