Merge remote-tracking branch 'origin/AC-13810' into spartans_pr_18022025

glo60612 · glo60612 · commit 638e3ab3df41 · 2025-02-18T17:24:46.000+05:30
diff --git a/app/code/Magento/Customer/Model/Customer.php b/app/code/Magento/Customer/Model/Customer.php
@@ -1102,7 +1102,8 @@ public function resetErrors()
      */
     public function afterSave()
     {
-        if ($this->getIndexer()->getState()->getStatus() == StateInterface::STATUS_VALID) {
+        $indexer = $this->getIndexer();
+        if (($indexer->getState()->getStatus() == StateInterface::STATUS_VALID) && !$indexer->isScheduled()) {
             $this->_getResource()->addCommitCallback([$this, 'reindex']);
         }
         return parent::afterSave();

Original file line number	Diff line number	Diff line change
`@@ -1102,7 +1102,8 @@ public function resetErrors()`
`1102`	`1102`	`*/`
`1103`	`1103`	`public function afterSave()`
`1104`	`1104`	`{`
`1105`		`- if ($this->getIndexer()->getState()->getStatus() == StateInterface::STATUS_VALID) {`
	`1105`	`+ $indexer = $this->getIndexer();`
	`1106`	`+ if (($indexer->getState()->getStatus() == StateInterface::STATUS_VALID) && !$indexer->isScheduled()) {`
`1106`	`1107`	`$this->_getResource()->addCommitCallback([$this, 'reindex']);`
`1107`	`1108`	`}`
`1108`	`1109`	`return parent::afterSave();`