Don't panic when entries can't be found
This commit is contained in:
parent
b6a73aefbf
commit
8034de544b
|
@ -884,7 +884,7 @@ func (v *StateResolution) resolveConflictsV2(
|
||||||
for _, resolvedEvent := range resolvedEvents {
|
for _, resolvedEvent := range resolvedEvents {
|
||||||
entry, ok := eventIDMap[resolvedEvent.EventID()]
|
entry, ok := eventIDMap[resolvedEvent.EventID()]
|
||||||
if !ok {
|
if !ok {
|
||||||
panic(fmt.Errorf("missing state entry for event ID %q", resolvedEvent.EventID()))
|
return nil, fmt.Errorf("missing state entry for event ID %q", resolvedEvent.EventID())
|
||||||
}
|
}
|
||||||
notConflicted = append(notConflicted, entry)
|
notConflicted = append(notConflicted, entry)
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue