Skip to content

Commit d3f421e

Browse files
authored
Merge pull request #3402 from High-Voltage-Engineering/dh-copy-snapshot-data-id
Copy snapshot data node ID over in sanitization like for configuration nodes
2 parents 11981a9 + d59ec56 commit d3f421e

File tree

1 file changed

+1
-1
lines changed
  • services/save-and-restore/src/main/java/org/phoebus/service/saveandrestore/persistence/dao/impl/elasticsearch

1 file changed

+1
-1
lines changed

services/save-and-restore/src/main/java/org/phoebus/service/saveandrestore/persistence/dao/impl/elasticsearch/ElasticsearchDAO.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -671,7 +671,6 @@ private void deleteNode(Node nodeToDelete) {
671671

672672
@Override
673673
public Configuration createConfiguration(String parentNodeId, Configuration configuration) {
674-
675674
ConfigurationData sanitizedConfigurationData = removeDuplicatePVNames(configuration.getConfigurationData());
676675
configuration.setConfigurationData(sanitizedConfigurationData);
677676

@@ -901,6 +900,7 @@ protected SnapshotData removeDuplicateSnapshotItems(SnapshotData snapshotData) {
901900
SnapshotData sanitizedSnapshotData = new SnapshotData();
902901
List<SnapshotItem> sanitizedList = new ArrayList<>(sanitizedMap.values());
903902
sanitizedSnapshotData.setSnapshotItems(sanitizedList);
903+
sanitizedSnapshotData.setUniqueId(snapshotData.getUniqueId());
904904
return sanitizedSnapshotData;
905905
}
906906

0 commit comments

Comments
 (0)