Rework hierarchy for network ports

This commit is contained in:
crschnick
2026-09-14 14:14:27 +00:00
parent 25ff10d515
commit e4108a8206
2 changed files with 4 additions and 3 deletions
@@ -745,6 +745,7 @@ public abstract class DataStorage {
}
var oldChildren = getStoreChildren(e);
var oldDeepChildren = getDeepStoreChildren(e);
var toRemove = oldChildren.stream()
.filter(oc -> {
var oid = getFixedChildId(oc);
@@ -767,7 +768,7 @@ public abstract class DataStorage {
return false;
}
return oldChildren.stream()
return oldDeepChildren.stream()
.filter(oc -> oc.getStore() instanceof FixedChildStore)
.filter(oc -> getFixedChildId(oc).isPresent())
.noneMatch(oc -> {
@@ -775,7 +776,7 @@ public abstract class DataStorage {
});
})
.toList();
var toUpdate = new ArrayList<>(oldChildren.stream()
var toUpdate = new ArrayList<>(oldDeepChildren.stream()
.map(oc -> {
var oid = getFixedChildId(oc);
if (oid.isEmpty()) {
@@ -661,7 +661,7 @@ public class DataStoreEntry extends DataStorageElement {
notifyUpdate(false, true);
}
void setStoreInternal(DataStore store, boolean updateTime) {
public void setStoreInternal(DataStore store, boolean updateTime) {
var changed = !Objects.equals(getStore(), store);
if (!changed) {
return;