CSSTUDIO-2555 Handle the case where logEntry.getDescription() returns…

… null, also.
ControlSystemStudio · Aug 20, 2024 · 71476c3 · 71476c3
1 parent 4b3e52f
commit 71476c3
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/...ook/olog/ui/src/main/java/org/phoebus/logbook/olog/ui/write/LogEntryUpdateController.java b/...ook/olog/ui/src/main/java/org/phoebus/logbook/olog/ui/write/LogEntryUpdateController.java
@@ -273,7 +273,15 @@ public void initialize() {
         titleProperty.set(logEntry.getTitle());
 
         textArea.textProperty().bindBidirectional(descriptionProperty);
-        descriptionProperty.set(logEntry.getSource() != null ? logEntry.getSource() : logEntry.getDescription());
+        if (logEntry.getSource() != null) {
+            descriptionProperty.set(logEntry.getSource());
+        }
+        else if (logEntry.getDescription() != null) {
+            descriptionProperty.set(logEntry.getDescription());
+        }
+        else {
+            descriptionProperty.set("");
+        }
         descriptionProperty.addListener((observable, oldValue, newValue) -> isDirty = true);
 
         Image tagIcon = ImageCache.getImage(LogEntryUpdateController.class, "/icons/add_tag.png");