Skip to content

Commit 8644688

Browse files
author
Alex Bomko
committed
MAGETWO-44406: [Windows] Deploy Magento with Sample Data leads to memory leak
1 parent 5fb4029 commit 8644688

File tree

1 file changed

+14
-0
lines changed

1 file changed

+14
-0
lines changed

app/code/Magento/CatalogSampleData/Model/Product/Converter.php

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,11 @@ class Converter
4242
*/
4343
protected $attributeSetId;
4444

45+
/**
46+
* @var array
47+
*/
48+
protected $loadedAttributeSets;
49+
4550
/**
4651
* @var \Magento\Catalog\Model\ResourceModel\Product\Collection
4752
*/
@@ -215,6 +220,14 @@ public function getAttributeOptions($attributeCode)
215220
*/
216221
protected function loadAttributeOptions()
217222
{
223+
$attributeSetIdCache = $this->getAttributeSetId();
224+
if (empty($attributeSetIdCache)) {
225+
$attributeSetIdCache = 0;
226+
}
227+
if (isset($this->loadedAttributeSets[$attributeSetIdCache])) {
228+
return $this;
229+
}
230+
218231
/** @var \Magento\Catalog\Model\ResourceModel\Product\Attribute\Collection $collection */
219232
$collection = $this->attributeCollectionFactory->create();
220233
$collection->addFieldToSelect(['attribute_code', 'attribute_id']);
@@ -225,6 +238,7 @@ protected function loadAttributeOptions()
225238
->setAttributeFilter($item->getAttributeId())->setPositionOrder('asc', true)->load();
226239
$this->attributeCodeOptionsPair[$item->getAttributeCode()] = $options;
227240
}
241+
$this->loadedAttributeSets[$attributeSetIdCache] = true;
228242
return $this;
229243
}
230244

0 commit comments

Comments
 (0)