Skip to content

Commit a4732ec

Browse files
committed
fix(bulk-model-sync): add fallback to targetRef if the target cannot be resolved
1 parent 67d304e commit a4732ec

File tree

1 file changed

+2
-2
lines changed
  • bulk-model-sync-lib/src/commonMain/kotlin/org/modelix/model/sync/bulk

1 file changed

+2
-2
lines changed

bulk-model-sync-lib/src/commonMain/kotlin/org/modelix/model/sync/bulk/ModelImporter.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -285,6 +285,7 @@ class ModelImporter(
285285
nodeData.references.forEach {
286286
val expectedTargetId = it.value
287287
val actualTargetId = node.getReferenceTarget(it.key)?.originalId()
288+
?: node.getReferenceTargetRef(it.key)?.serialize()
288289
if (actualTargetId != expectedTargetId) {
289290
val expectedTarget = originalIdToExisting[expectedTargetId]
290291
if (expectedTarget == null) {
@@ -296,8 +297,7 @@ class ModelImporter(
296297
}
297298
val toBeRemoved = node.getReferenceRoles().toSet() - nodeData.references.keys
298299
toBeRemoved.forEach {
299-
val nullReference: INodeReference? = null
300-
node.setReferenceTarget(it, nullReference)
300+
node.setReferenceTarget(it, null as INodeReference?)
301301
}
302302
}
303303
}

0 commit comments

Comments
 (0)