AKM-24: Connector fails because of invalid entities

oroinc · Jul 8, 2021 · 875202a · 875202a
1 parent d1d8f29
commit 875202a
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/ImportExport/Strategy/StrategyRelationsTrait.php b/ImportExport/Strategy/StrategyRelationsTrait.php
@@ -74,12 +74,10 @@ protected function updateRelations($entity, array $itemData = null)
                                 true
                             );
 
+                            $key = $relationCollection->indexOf($collectionEntity);
+                            $relationCollection->removeElement($collectionEntity);
                             if ($existingCollectionEntity) {
-                                if (!$relationCollection->contains($existingCollectionEntity)) {
-                                    $relationCollection->removeElement($collectionEntity);
-                                    $relationCollection->add($existingCollectionEntity);
-                                }
-
+                                $relationCollection->set($key, $existingCollectionEntity);
                                 $this->cacheInverseFieldRelation($entityName, $fieldName, $existingCollectionEntity);
                             }
                         }