Merge pull request #2965 from ControlSystemStudio/log_submit_fix

Fix NPE when creating log entry
ControlSystemStudio · Mar 4, 2024 · d9da0b2 · d9da0b2
2 parents 09f38fa + 9fd75f2
commit d9da0b2
Showing 1 changed file with 5 additions and 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
@@ -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);
+        }
     }
 }