ACPT-1052: Some Luma Storefront Scenarios Are Broken

Author: kandy

app/code/Magento/Eav/Model/Entity/Attribute/AbstractAttribute.php

@@ -216,16 +216,6 @@ public function __construct(
             ?: \Magento\Framework\App\ObjectManager::getInstance()->get(FrontendLabelFactory::class);
     }
 
-    /**
-     * @inheritdoc
-     */
-    public function _resetState() : void
-    {
-        if ($this->_backend instanceof ResetAfterRequestInterface) {
-            $this->_backend->_resetState();
-        }
-    }
-
     /**
      * Get Serializer instance.
      *
@@ -1458,17 +1448,16 @@ public function __wakeup()
      */
     public function _resetState(): void
     {
-        $this->unsetData('store_label');
-        $this->unsetData(self::OPTIONS);
-        if ($this->usesSource() && $this->getSource() instanceof ResetAfterRequestInterface) {
-            $this->getSource()->_resetState();
+        $this->unsetData('store_label'); // store specific
+        $this->unsetData(self::OPTIONS); // store specific
+        if ($this->_source instanceof ResetAfterRequestInterface) {
+            $this->_source->_resetState();
         }
-        if ($this->getBackend() instanceof ResetAfterRequestInterface) {
-            $this->getBackend() ->_resetState();
+        if ($this->_backend instanceof ResetAfterRequestInterface) {
+            $this->_backend->_resetState();
         }
-        if ($this->getFrontend()instanceof ResetAfterRequestInterface) {
-            $this->getFrontend() ->_resetState();
+        if ($this->_frontend instanceof ResetAfterRequestInterface) {
+            $this->_frontend->_resetState();
         }
-
     }
 }