Merge pull request #3125 from ControlSystemStudio/fix_sar_date_picker

Bug fix for save&restore snapshot date/time picker
ControlSystemStudio · Aug 30, 2024 · 77356d2 · 77356d2
2 parents 59e0874 + cb2799a
commit 77356d2
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/...src/main/java/org/phoebus/applications/saveandrestore/ui/snapshot/SnapshotController.java b/...src/main/java/org/phoebus/applications/saveandrestore/ui/snapshot/SnapshotController.java
@@ -416,22 +416,22 @@ public void addSnapshotFromArchiver(Node configurationNode){
             }
             return null;
         });
-        Instant time = timePickerDialog.showAndWait().get();
-        if(time == null){ // User cancels date/time picker dialog
+        Optional<Instant> time = timePickerDialog.showAndWait();
+        if(time.isEmpty()){ // User cancels date/time picker dialog
             return;
         }
         disabledUi.set(true);
         JobManager.schedule("Add snapshot from archiver", monitor -> {
             List<SnapshotItem> snapshotItems;
             try {
-                snapshotItems = SaveAndRestoreService.getInstance().takeSnapshot(configurationNode.getUniqueId(), time);
+                snapshotItems = SaveAndRestoreService.getInstance().takeSnapshot(configurationNode.getUniqueId(), time.get());
             } catch (Exception e) {
                 LOGGER.log(Level.WARNING, "Failed to query archiver for data", e);
                 disabledUi.set(false);
                 return;
             }
             Snapshot snapshot = new Snapshot();
-            snapshot.setSnapshotNode(Node.builder().nodeType(NodeType.SNAPSHOT).name(Messages.archiver).created(new Date(time.toEpochMilli())).build());
+            snapshot.setSnapshotNode(Node.builder().nodeType(NodeType.SNAPSHOT).name(Messages.archiver).created(new Date(time.get().toEpochMilli())).build());
             SnapshotData snapshotData = new SnapshotData();
             snapshotData.setUniqueId("anonymous");
             snapshotData.setSnapshotItems(snapshotItems);