ACP2E-2301: Customers and Addresses (single file) Import fails

Author: Anujnehra

app/code/Magento/CustomerImportExport/Model/Import/CustomerComposite.php

@@ -280,14 +280,17 @@ protected function _importData()
     {
         if ($this->getIds()) {
             $this->_customerEntity->setIds($this->getIds());
-            $this->_addressEntity->setCustomerAttributes($this->_customerAttributes)->setIds($this->getIds());
         }
         $result = $this->_customerEntity->importData();
         $this->countItemsCreated += $this->_customerEntity->getCreatedItemsCount();
         $this->countItemsUpdated += $this->_customerEntity->getUpdatedItemsCount();
         $this->countItemsDeleted += $this->_customerEntity->getDeletedItemsCount();
         if ($this->getBehavior() != \Magento\ImportExport\Model\Import::BEHAVIOR_DELETE) {
-            $result = $result && $this->_addressEntity->setCustomerAttributes($this->_customerAttributes)->importData();
+            $addressEntityObject = $this->_addressEntity->setCustomerAttributes($this->_customerAttributes);
+            if ($this->getIds() && $addressEntityObject !== null) {
+                $addressEntityObject->setIds($this->getIds());
+            }
+            $result = $result && $addressEntityObject->importData();
         }
         if ($result) {
             $this->indexerProcessor->markIndexerAsInvalid();

app/code/Magento/CustomerImportExport/Test/Unit/Model/Import/CustomerCompositeTest.php

@@ -262,15 +262,17 @@ protected function _getModelMockForImportData($isDeleteBehavior, $customerImport
         if ($isDeleteBehavior || !$customerImport) {
             $addressEntity->expects($this->never())->method('importData');
         } else {
-            $addressEntity->expects($this->once())->method('setCustomerAttributes')->willReturnSelf();
+            $addressEntity->expects($this->atMost(2))->method('setCustomerAttributes')->willReturnSelf();
             $addressEntity->expects($this->once())->method('importData')->willReturn($addressImport);
         }
 
         $data = $this->_getModelDependencies();
         $data['customer_entity'] = $customerEntity;
         $data['address_entity'] = $addressEntity;
 
-        return $this->_createModelMock($data);
+        $obj = $this->_createModelMock($data);
+        $obj->setIds([1, 2]);
+        return $obj;
     }
 
     /**