aws profile fixes

This commit is contained in:
crschnick
2026-01-05 15:10:26 +00:00
parent 06e7fa023d
commit 8d876960ed
@@ -762,8 +762,11 @@ public abstract class DataStorage {
}
var s = pair.getKey().getStorePersistentState();
var mergedState = s.mergeCopy(pair.getValue().get().getStorePersistentState());
pair.getKey().setStorePersistentState(mergedState);
// We might not be a stateful store
if (s != null) {
var mergedState = s.mergeCopy(pair.getValue().get().getStorePersistentState());
pair.getKey().setStorePersistentState(mergedState);
}
if (pair.getKey().getOrderIndex() == 0 && pair.getValue().get().getOrderIndex() != 0) {
pair.getKey().setOrderIndex(pair.getValue().get().getOrderIndex());