Skip to content

Commit f3b9f24

Browse files
MAGETWO-75452: [Backport] - Fix Issue: “Asymmetric transaction rollback error” if commit callbacks throw exceptions magento#9955 - for 2.2
1 parent 6a57ea8 commit f3b9f24

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

lib/internal/Magento/Framework/Model/ResourceModel/AbstractResource.php

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
use Magento\Framework\DataObject;
1010
use Magento\Framework\Model\CallbackPool;
1111
use Magento\Framework\Serialize\Serializer\Json;
12+
use Psr\Log\LoggerInterface;
1213

1314
/**
1415
* Abstract resource model
@@ -24,9 +25,9 @@ abstract class AbstractResource
2425
protected $serializer;
2526

2627
/**
27-
* @var \Psr\Log\LoggerInterface
28+
* @var LoggerInterface
2829
*/
29-
protected $_logger;
30+
private $logger;
3031

3132
/**
3233
* Constructor
@@ -261,15 +262,15 @@ protected function getSerializer()
261262
/**
262263
* Get logger
263264
*
264-
* @return \Psr\Log\LoggerInterface
265+
* @return LoggerInterface
265266
* @deprecated 100.2.0
266267
* @since 100.2.0
267268
*/
268269
private function getLogger()
269270
{
270-
if (null === $this->_logger) {
271-
$this->_logger = ObjectManager::getInstance()->get(\Psr\Log\LoggerInterface::class);
271+
if (null === $this->logger) {
272+
$this->logger = ObjectManager::getInstance()->get(LoggerInterface::class);
272273
}
273-
return $this->_logger;
274+
return $this->logger;
274275
}
275276
}

0 commit comments

Comments
 (0)