MAGETWO-69149: Flip the property assignments for _logger and _fetchStrategy in __wakeup #9618

Oleksii Korshenko · Oleksii Korshenko · commit 4da7d74e9b80 · 2017-05-15T06:45:15.000-07:00
- Merge Pull Request #9618 from cykirsch/magento2:bug-abstractdb-wake
diff --git a/lib/internal/Magento/Framework/Data/Collection/AbstractDb.php b/lib/internal/Magento/Framework/Data/Collection/AbstractDb.php
@@ -902,8 +902,8 @@ public function __wakeup()
     {
         parent::__wakeup();
         $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
-        $this->_fetchStrategy = $objectManager->get(Logger::class);
-        $this->_logger = $objectManager->get(FetchStrategyInterface::class);
+        $this->_logger = $objectManager->get(Logger::class);
+        $this->_fetchStrategy = $objectManager->get(FetchStrategyInterface::class);
         $this->_conn = $objectManager->get(ResourceConnection::class)->getConnection();
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -902,8 +902,8 @@ public function __wakeup()`
`902`	`902`	`{`
`903`	`903`	`parent::__wakeup();`
`904`	`904`	`$objectManager = \Magento\Framework\App\ObjectManager::getInstance();`
`905`		`- $this->_fetchStrategy = $objectManager->get(Logger::class);`
`906`		`- $this->_logger = $objectManager->get(FetchStrategyInterface::class);`
	`905`	`+ $this->_logger = $objectManager->get(Logger::class);`
	`906`	`+ $this->_fetchStrategy = $objectManager->get(FetchStrategyInterface::class);`
`907`	`907`	`$this->_conn = $objectManager->get(ResourceConnection::class)->getConnection();`
`908`	`908`	`}`
`909`	`909`	`}`