Merge pull request #223 from magento-performance/application-server

ACPT-1360: _resetState methods cause same state as initially constructed

Author: andimov

app/code/Magento/PageBuilder/Model/ResourceModel/Template/Grid/Collection.php

@@ -31,6 +31,12 @@ class Collection extends TemplateCollection implements SearchResultInterface
      */
     private $aggregations;
 
+    /** @var string */
+    private $model;
+
+    /** @var string */
+    private $resourceModel;
+
     /**
      * @param EntityFactoryInterface $entityFactory
      * @param LoggerInterface $logger
@@ -58,6 +64,8 @@ public function __construct(
         $connection = null,
         AbstractDb $resource = null
     ) {
+        $this->resourceModel = $resourceModel;
+        $this->model = $model;
         parent::__construct(
             $entityFactory,
             $logger,
@@ -68,10 +76,19 @@ public function __construct(
         );
         $this->_eventPrefix = $eventPrefix;
         $this->_eventObject = $eventObject;
-        $this->_init($model, $resourceModel);
+        $this->_init($this->model, $this->resourceModel);
         $this->setMainTable($mainTable);
     }
 
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        parent::_resetState();
+        $this->_init($this->model, $this->resourceModel);
+    }
+
     /**
      * Get aggregations
      *